devel
This commit is contained in:
parent
f81c1d69c5
commit
37f548ce46
89 changed files with 466 additions and 70 deletions
4
app/controllers/application_controller.rb
Normal file → Executable file
4
app/controllers/application_controller.rb
Normal file → Executable file
|
@ -39,4 +39,8 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
end
|
||||
|
||||
def selected_folder
|
||||
session[:selected_folder] ? @selected_folder = session[:selected_folder] : @selected_folder = $defaults['imap_inbox_folder']
|
||||
end
|
||||
|
||||
end
|
||||
|
|
11
app/controllers/internal_controller.rb
Normal file → Executable file
11
app/controllers/internal_controller.rb
Normal file → Executable file
|
@ -4,9 +4,16 @@ class InternalController < ApplicationController
|
|||
layout "simple"
|
||||
|
||||
def error
|
||||
@title = t(:general_error)
|
||||
@title = params[:title] || t(:general_error)
|
||||
@error = params[:error] || t(:unspecified_error)
|
||||
logger.error @error
|
||||
logger.error "!!! InternalControllerError: " + @error
|
||||
end
|
||||
|
||||
def imaperror
|
||||
@title = t(:imap_error)
|
||||
@error = params[:error] || t(:unspecified_error)
|
||||
logger.error "!!! InternalControllerImapError: " + @error
|
||||
render 'error'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
27
app/controllers/messages_controller.rb
Normal file → Executable file
27
app/controllers/messages_controller.rb
Normal file → Executable file
|
@ -1,14 +1,33 @@
|
|||
require 'imap_utils'
|
||||
require 'imap_session'
|
||||
require 'imap_mailbox'
|
||||
|
||||
class MessagesController < ApplicationController
|
||||
|
||||
include ImapUtils
|
||||
include ImapMailboxModule
|
||||
include ImapSessionModule
|
||||
|
||||
before_filter :check_current_user ,:selected_folder
|
||||
|
||||
before_filter :open_imap_session, :only => :refresh
|
||||
after_filter :close_imap_session, :only => :refresh
|
||||
|
||||
before_filter :check_current_user, :info
|
||||
theme :theme_resolver
|
||||
|
||||
def index
|
||||
logger.info "YYYYYYYYYYYYY #{@m.inspect}"
|
||||
@folders = @current_user.folders.order("name asc")
|
||||
@current_folder = @current_user.folders.current(@selected_folder)
|
||||
end
|
||||
|
||||
def refresh
|
||||
@current_user.folders.destroy_all
|
||||
folders=@mailbox.folders
|
||||
Folder.createBulk(@current_user,folders)
|
||||
redirect_to :action => 'index'
|
||||
end
|
||||
|
||||
def folder
|
||||
session[:selected_folder] = params[:id]
|
||||
redirect_to :action => 'index'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
9
app/controllers/user_controller.rb
Normal file → Executable file
9
app/controllers/user_controller.rb
Normal file → Executable file
|
@ -15,7 +15,7 @@ class UserController < ApplicationController
|
|||
def authenticate
|
||||
user = User.find_by_email(params[:user][:email])
|
||||
if user.nil?
|
||||
redirect_to :action => 'unknown'
|
||||
redirect_to :action => 'unknown' ,:email=> params[:user][:email]
|
||||
else
|
||||
auten = true
|
||||
if auten == true
|
||||
|
@ -26,7 +26,7 @@ class UserController < ApplicationController
|
|||
redirect_to(session["return_to"])
|
||||
session["return_to"] = nil
|
||||
else
|
||||
redirect_to :controller=> "messages", :action=>"index"
|
||||
redirect_to :controller=> 'messages', :action=> 'refresh'
|
||||
end
|
||||
|
||||
|
||||
|
@ -49,12 +49,15 @@ class UserController < ApplicationController
|
|||
end
|
||||
|
||||
def create
|
||||
|
||||
@user = User.new
|
||||
@server = Server.new
|
||||
@user.email = params["user_email"]
|
||||
@user.first_name = params["user_first_name"]
|
||||
@user.last_name = params["user_last_name"]
|
||||
|
||||
@server = Server.new
|
||||
@server.name = params["server_name"]
|
||||
|
||||
if @user.valid? and @server.valid?
|
||||
@user.save
|
||||
@server.user_id = @user.id
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue