devel
This commit is contained in:
parent
b4bc16ed14
commit
2afeebad53
49 changed files with 342 additions and 160 deletions
|
@ -1,10 +1,12 @@
|
|||
require 'tempfile'
|
||||
|
||||
class ContactsController < ApplicationController
|
||||
|
||||
before_filter :check_current_user,:selected_folder, :get_current_folders
|
||||
|
||||
before_filter :get_contacts, :only => [:index]
|
||||
|
||||
before_filter :prepare_ops_buttons, :only => [:index]
|
||||
before_filter :prepare_ops_buttons, :prepare_export_import_buttons,:only => [:index]
|
||||
|
||||
theme :theme_resolver
|
||||
|
||||
|
@ -67,6 +69,40 @@ class ContactsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
def external
|
||||
if params["export"]
|
||||
redirect_to :action => 'export'
|
||||
return
|
||||
elsif params["import"]
|
||||
begin
|
||||
raise t(:no_file_chosen,:scope=>:common) if not params[:upload]
|
||||
raise t(:no_tmp_dir,:scope=>:common) if not File.exists?($defaults["msg_upload_dir"])
|
||||
tmp_file = Tempfile.new($defaults["contact_tmp_filename"],$defaults["msg_upload_dir"])
|
||||
tmp_file.write(params[:upload][:datafile].read)
|
||||
tmp_file.flush
|
||||
tmp_file.rewind
|
||||
tmp_file.readlines.each do |line|
|
||||
Contact.import(@current_user,line)
|
||||
end
|
||||
rescue Exception => e
|
||||
flash[:error] = e.to_s
|
||||
end
|
||||
end
|
||||
flash[:notice] = t(:were_imported,:scope=>:contact) if not flash[:error]
|
||||
redirect_to :action => 'index'
|
||||
end
|
||||
|
||||
def export
|
||||
contacts = @current_user.contacts
|
||||
s = ""
|
||||
contacts.each do |c|
|
||||
s += c.export + "\r\n"
|
||||
end
|
||||
headers['Content-type'] = "text/csv"
|
||||
headers['Content-Disposition'] = %(attachment; filename="contacts.csv")
|
||||
render :text => s
|
||||
end
|
||||
|
||||
####################################### protected section ################################
|
||||
|
||||
protected
|
||||
|
@ -78,6 +114,12 @@ class ContactsController < ApplicationController
|
|||
@buttons << {:text => 'delete_selected',:scope=>'contact',:image => 'minus.png'}
|
||||
end
|
||||
|
||||
def prepare_export_import_buttons
|
||||
@ei_buttons = []
|
||||
@ei_buttons << {:text => 'import',:scope=>'contact',:image => 'right.png'}
|
||||
@ei_buttons << {:text => 'export',:scope=>'contact',:image => 'left.png'}
|
||||
end
|
||||
|
||||
####################################### private section ##################################
|
||||
|
||||
private
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
class EventsController < ApplicationController
|
||||
end
|
|
@ -144,7 +144,7 @@ class FoldersController < ApplicationController
|
|||
trash_folder.messages.destroy_all
|
||||
trash_folder.update_attributes(:unseen => 0, :total => 0)
|
||||
rescue Exception => e
|
||||
flash[:error] = "#{t(:imap_error)} (#{e.to_s})"
|
||||
flash[:error] = "#{t(:imap_error,:scope=>:common)} (#{e.to_s})"
|
||||
end
|
||||
redirect_to :controller => 'messages', :action => 'index'
|
||||
end
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
class InternalController < ApplicationController
|
||||
|
||||
before_filter :check_current_user ,:selected_folder, :get_current_folders, :only => [:about]
|
||||
|
||||
theme :theme_resolver
|
||||
layout "simple"
|
||||
|
||||
|
||||
ERRORS = [
|
||||
:internal_server_error,
|
||||
:not_found,
|
||||
|
@ -43,4 +46,8 @@ class InternalController < ApplicationController
|
|||
redirect_to :controller=>'user', :action => 'login'
|
||||
end
|
||||
|
||||
def about
|
||||
render 'internal/about', :layout => 'application'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -65,9 +65,23 @@ class MessagesController < ApplicationController
|
|||
end
|
||||
|
||||
def compose
|
||||
#before filter
|
||||
#before filter :prepare_compose_buttons, :create_message_with_params
|
||||
@operation = :new
|
||||
logger.custom('m',@message.inspect)
|
||||
if params["cid"].present?
|
||||
contact = @current_user.contacts.find_by_id(params["cid"])
|
||||
if not contact.nil?
|
||||
@message.to_addr = contact.email
|
||||
end
|
||||
elsif params["cids"].present?
|
||||
contacts = []
|
||||
params["cids"].each do |c|
|
||||
contact = @current_user.contacts.find_by_id(c)
|
||||
if not contact.nil?
|
||||
contacts << contact.email
|
||||
end
|
||||
end
|
||||
@message.to_addr = contacts.join(';')
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
|
@ -2,6 +2,7 @@ require 'imap_session'
|
|||
require 'imap_mailbox'
|
||||
require 'imap_message'
|
||||
require 'mail'
|
||||
require 'mail_plugin_extension'
|
||||
|
||||
class MessagesOpsController < ApplicationController
|
||||
|
||||
|
@ -128,7 +129,7 @@ class MessagesOpsController < ApplicationController
|
|||
@operation = :upload
|
||||
create_message_with_params
|
||||
if not params[:upload]
|
||||
flash[:error] = t(:no_attach,:scope=>:compose)
|
||||
flash[:error] = t(:no_file_chosen,:scope=>:common)
|
||||
else
|
||||
name = params[:upload][:datafile].original_filename
|
||||
upload_dir = $defaults["msg_upload_dir"]
|
||||
|
@ -188,11 +189,12 @@ class MessagesOpsController < ApplicationController
|
|||
mail = Mail.new
|
||||
mail.subject = params[:message][:subject]
|
||||
mail.from = @current_user.full_address
|
||||
#TODO check if email address is valid if not get address from contacts
|
||||
mail.to = params[:message][:to_addr]
|
||||
mail.body = params[:message][:body]
|
||||
|
||||
attachments = Dir.glob(File.join($defaults["msg_upload_dir"],@current_user.username + "*"))
|
||||
logger.custom('attach',attachments.inspect)
|
||||
#logger.custom('attach',attachments.inspect)
|
||||
attachments.each do |a|
|
||||
mail.add_file :filename => File.basename(a.gsub(/#{@current_user.username}_/,"")), :content => File.read(a)
|
||||
end
|
||||
|
@ -221,7 +223,7 @@ class MessagesOpsController < ApplicationController
|
|||
@mailbox.append(@sent_folder.full_name,mail.to_s,[:Seen])
|
||||
|
||||
rescue Exception => e
|
||||
flash[:error] = "#{t(:imap_error)} (#{e.to_s})"
|
||||
flash[:error] = "#{t(:imap_err,:scope=>:internal)} (#{e.to_s})"
|
||||
redirect_to :controller => 'messages', :action => 'index'
|
||||
return
|
||||
end
|
||||
|
@ -238,10 +240,13 @@ class MessagesOpsController < ApplicationController
|
|||
if @drafts_folder.nil?
|
||||
raise t(:not_configured_drafts,:scope=>:compose)
|
||||
end
|
||||
# TODO delete old one if was edit
|
||||
@mailbox.append(@drafts_folder.full_name,mail.to_s,[:Seen])
|
||||
if params[:olduid].present?
|
||||
@mailbox.move_message(params[:olduid],@trash_folder.full_name)
|
||||
@mailbox.expunge
|
||||
end
|
||||
rescue Exception => e
|
||||
flash[:error] = "#{t(:imap_error)} (#{e.to_s})"
|
||||
flash[:error] = "#{t(:imap_error,:scope=>:internal)} (#{e.to_s})"
|
||||
redirect_to :controller => 'messages', :action => 'index'
|
||||
return
|
||||
end
|
||||
|
@ -250,24 +255,24 @@ class MessagesOpsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
###################################### protected section #######################################
|
||||
|
||||
protected
|
||||
|
||||
#FIXME edit does not support attachments
|
||||
def edit
|
||||
old_message = @current_user.messages.find(params[:id].first)
|
||||
old_message = @current_user.messages.find(params[:id])
|
||||
@message = Message.new
|
||||
@message.to_addr = old_message.to_addr
|
||||
@message.subject = old_message.subject
|
||||
|
||||
imap_message = @mailbox.fetch_body(old_message.uid)
|
||||
mail = Mail.new(imap_message)
|
||||
if mail.multipart?
|
||||
@message.body = mail.text_part.decoded_and_charseted
|
||||
@message.body = mail.text_part.decoded_and_charseted.gsub(/<\/?[^>]*>/, "")
|
||||
else
|
||||
@message.body = mail.decoded_and_charseted
|
||||
@message.body = mail.decoded_and_charseted.gsub(/<\/?[^>]*>/, "")
|
||||
end
|
||||
@attachments = []
|
||||
@operation = :edit
|
||||
@olduid = old_message.uid
|
||||
render 'messages/compose'
|
||||
end
|
||||
|
||||
|
@ -280,7 +285,7 @@ class MessagesOpsController < ApplicationController
|
|||
imap_message = @mailbox.fetch_body(old_message.uid)
|
||||
mail = Mail.new(imap_message)
|
||||
if mail.multipart?
|
||||
@message.body = mail.text_part.decoded_and_charseted
|
||||
@message.body = mail.text_part.decoded_and_charseted.gsub(/<\/?[^>]*>/, "")
|
||||
else
|
||||
@message.body = mail.decoded_and_charseted.gsub(/<\/?[^>]*>/, "")
|
||||
end
|
||||
|
@ -288,6 +293,11 @@ class MessagesOpsController < ApplicationController
|
|||
@operation = :reply
|
||||
render 'messages/compose'
|
||||
end
|
||||
###################################### protected section #######################################
|
||||
|
||||
protected
|
||||
|
||||
|
||||
|
||||
############################################ set_mail_defaults ####################################
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue