parlement 0.14 → 0.17

data/app/controllers/{application.rb → application_controller.rb}

@@ -1,20 +1,23 @@
 # The filters added to this controller will be run for all controllers in the application.
 # Likewese will all the methods added be available for all controllers.
 
-require 'login_engine'
-require 'term/ansicolor'
+# Added temporarily, until gettext has evolved to invlude it
+## See http://zargony.com/2008/02/12/edge-rails-and-gettext-undefined-method-file_exists-nomethoderror
+module ActionView
+	class Base
+		delegate :file_exists?, :to => :finder unless respond_to?(:file_exists?)
+	end
+end
 
 class ApplicationController < ActionController::Base
-	helper_method :filter
-
-	include LoginEngine
 	include Term::ANSIColor
 
 	init_gettext "parlement"
 
+	helper_method :filter
+
 	before_filter :set_login_from_cookie
 	#after_filter :fix_unicode_for_safari
-	after_filter OutputCompressionFilter
 
 	# automatically and transparently fixes utf-8 bug 
 	# with Safari when using xmlhttp
@@ -26,15 +29,15 @@ class ApplicationController < ActionController::Base
 	end
 
 	def set_login_from_cookie
-		unless session[:lastUpdatedView] or session[:person]
+		unless session[:lastUpdatedView] or session[:person_id]
 			if (cookies[:person_name] and \
         person = Person.find_by_name(cookies[:person_name])) and \
 				((!person.user and !cookies[:salted_password]) \
 				 or (person.user \
 						 and person.user.salted_password == cookies[:salted_password]))
 				logger.info yellow { bold { "#{person.name} is back" } }
-				session[:person] = person 
-				session[:user] = person.user
+				session[:person_id] = person.id
+				session[:user_id] = person.user.id if person.user
 
 				person.last_login = Time.now
 				person.save!
@@ -43,11 +46,11 @@ class ApplicationController < ActionController::Base
 	end
 
 	def filter
-		if request.cookies['filter'] && request.cookies['filter'][0]
-			filter = request.cookies['filter'][0].to_i - 1
+		if request.cookies['filter'] && request.cookies['filter']
+			filter = request.cookies['filter'].to_i - 1
 			filter = nil unless filter >= 0
 		else
-			filter = 0
+			filter = 1
 		end
 		filter
 	end

data/app/controllers/elt_controller.rb

@@ -1,26 +1,43 @@
 #
-# This is the central component to parlement
+# This is the central element to parlement
 #
 # An element is just the name for a poll/message/issue
 #
 class EltController < ApplicationController
 	def index
-		params[:id] = params[:id].gsub(/.html/, '')
 		show
 	end
 
 	def show
+		params[:id] = request.subdomains[0] unless params[:id]
+		params[:id] = Elt.find(:first, :conditions => "parent_id = 'ROOT'", :order => 'created_on').id unless params[:id]
 		params[:id] = params[:id].gsub(/.html/, '')
+
 		@elt = Elt.find(params[:id])
 		@title = @elt.subject
 		@title += " (parlement)" if !@title.downcase.include? "parlement"
 
-		render :layout => 'top'
+		render :layout => 'top', :template => 'elt/show'
+
+	#rescue ActiveRecord::StatementInvalid => e
+	#	load 'db/schema.rb'
+	#	redirect_to '/'
 
 	rescue ActiveRecord::RecordNotFound => e
-		flash[:error] = _("Element %s does not exist") % params[:id]
-		headers["Status"] = "301 Moved Permanently"
-		redirect_to '/'
+		root = Elt.find_by_id('ROOT')
+		if root and root.children.size > 0
+			render :status => 404, :file => "#{RAILS_ROOT}/public/404.html"
+		else
+			if root
+				@elt = root
+			else
+				@elt = Elt.new :subject => '', :lft => 0, :rgt => 1, :last_activity => Time.now
+				@elt.id = 'ROOT'
+				@elt.save
+			end
+			flash[:notice] = _("You need to create a top object (click on the new icon below)")
+			render :layout => 'top'
+		end
 	end
 
 	def list
@@ -49,14 +66,7 @@ class EltController < ApplicationController
 	end
 
 	def updateView
-		if session[:lastUpdatedView] && session[:lastUpdatedView] > Time.now - 9 then
-			# Protection against some browsers updating too fast
-			logger.info "Too soon"
-			render :inline => ""
-			return
-		end
-
-		session[:lastUpdatedView] ||= Time.now - 10
+		session[:lastUpdatedView] ||= Time.now - UPDATE_VIEW_PERIOD
 
 		@elt = Elt.find(params[:id])
 		acts = ""
@@ -69,7 +79,7 @@ class EltController < ApplicationController
 			</script> \
 			" if @elt.last_activity > session[:lastUpdatedView]
 
-		if person = session[:person]
+		if person = Person.find_by_id(session[:person_id])
 			visits = Visit.count \
 				:joins => "JOIN elts e1 ON e1.id = '#{params[:id]}' \
 					JOIN elts e2 ON visits.elt_id = e2.id \
@@ -98,14 +108,14 @@ class EltController < ApplicationController
 
 			visit = Visit.find_by_person_id_and_elt_id(person, params[:id])
 			if visit and person.last_login and person.last_login > visit.created_on then
-				logger.info "New visit"
+				logger.info yellow { "New visit" }
 				visit.destroy
 				visit = nil
 			end
 			visit = Visit.new(:person => person, :elt_id => params[:id]) unless visit
 			visit.filter = filter
 			visit.save!
-			logger.info "#{visits} visit(s), #{subscribers} subscriber(s)"
+			logger.info magenta { "#{visits} visit(s), #{subscribers} subscriber(s)" }
 		end
 
 		session[:lastUpdatedView] = Time.now
@@ -113,37 +123,61 @@ class EltController < ApplicationController
 	end
 
 	def rss
+		params[:id] = nil if params[:id].size == 0
+		params[:id] = request.subdomains[0] unless params[:id]
+		params[:id] = Elt.find(:first, :conditions => "parent_id = 'ROOT'", :order => 'created_on').id unless params[:id]
 		params[:id] = params[:id].gsub(/.rss/, '')
 		headers["Content-Type"] = "text/xml; charset=utf-8" 
 		@elt = Elt.find(params[:id]) if @elt == nil
+
+	rescue ActiveRecord::RecordNotFound => e
+		redirect_to '/404.html'
 	end
 
 	def vote_rss
+		params[:id] = nil if params[:id].size == 0
+		params[:id] = request.subdomains[0] unless params[:id]
+		params[:id] = Elt.find(:first, :conditions => "parent_id = 'ROOT'", :order => 'created_on').id unless params[:id]
 		params[:id] = params[:id].gsub(/.rss/, '')
 		headers["Content-Type"] = "text/xml; charset=utf-8" 
 		@elt = Elt.find(params[:id]) if @elt == nil
+
+	rescue ActiveRecord::RecordNotFound => e
+		redirect_to '/404.html'
 	end
 
 	# Used to initialise the elt, its subject mainly
 	def new
 		@elt = Elt.new(:parent_id => params[:id], :body => "")
 
-		if @elt.parent.subject.include? 'Re: '
-			@elt.subject = @elt.parent.subject 
+		if @elt.parent then
+			if @elt.parent.subject.include? 'Re: '
+				@elt.subject = @elt.parent.subject 
+			else
+				@elt.subject = 'Re: '+@elt.parent.subject 
+			end
 		else
-			@elt.subject = 'Re: '+@elt.parent.subject 
+			# Rejected if you are not coming from a valid elt
+			render :status => 404, :file => "#{RAILS_ROOT}/public/404.html"
 		end
 	end
 
 	def create
 		@elt = Elt.new(params[:elt])
-		@elt.person = session[:person]
+		@elt.person = Person.find_by_id(session[:person_id])
 
-		if !session[:person] \
-			and (@elt.subject =~ /([<>\/]|href)/ \
-			 or @elt.body =~ /(.*(http|href)(.*\n)*){3}/ \
-			 or @elt.body =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i \
-			 or @elt.body =~ /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}.*){3}/i) then
+		if !@elt.parent then
+			# Rejected if you are not coming from a valid elt
+			render :status => 404, :file => "#{RAILS_ROOT}/public/404.html"
+      return
+		end
+
+		if ((!@elt.person \
+				and (@elt.subject =~ /([<>\/]|href)/ \
+				 or @elt.body =~ /(.*(http|href)(.*\n)*)/ \
+				 or @elt.body =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i \
+				 or @elt.body =~ /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}.*){3}/i)) \
+			or ((!@elt.person or @elt.person.elts.size <= 1) and @elt.body =~ /(http|href)/)) then
 			logger.error red { underline { "SPAM! '#{@elt.subject}'" } }
 			logger.error "SPAM! '#{@elt.body}'"
 			flash[:error] = _('Sorry, to fight spam "<" ">" or "href" are forbidden in the subject, and there can not be more than 3 links in the body, you also can\'t input one simple email or more than 3 emails!')
@@ -182,7 +216,13 @@ class EltController < ApplicationController
 
 	def vote
 		@elt = Elt.find params[:id]
-		unless params[:choice][:value] =~ /^\s*(-1|0|\+1)(\s|$)/ then
+		if !session[:person_id] then
+			flash[:error] = 'Sorry, need to be authenticated to vote!'
+			render :partial => '/elt/choice', :locals => { :elt => @elt }
+			return
+		end
+
+		if !params[:choice][:value] =~ /^\s*(-1|0|\+1)(\s|$)/ then
 			logger.error red { underline { "SPAM! through the vote" } }
 			logger.error params[:choice][:value]
 			flash[:error] = 'Sorry, you can only vote here!'
@@ -191,24 +231,29 @@ class EltController < ApplicationController
 		end
 
 		vote = @elt.children.build
-		vote.person = session[:person]
+		vote.person = Person.find_by_id(session[:person_id])
 		vote.subject = @elt.subject
 		vote.subject = 'Re: '+vote.subject if vote.subject and !vote.subject.include? 'Re: '
 		vote.body = params[:choice][:value]
 
-		choice = Choice.find_by_elt_id_and_person_id @elt.id, (session[:person] ? session[:person].id : nil)
+		choice = Choice.find_by_elt_id_and_person_id @elt.id, session[:person_id]
 
 		if choice and choice.value == vote.body.to_i then
-			logger.info "#{(session[:person] ? session[:person].name : 'null')} voting 0"
+			logger.info "#{session[:person_id]} voting 0"
 			vote.body = "0"
 		else
-			logger.info "#{(session[:person] ? session[:person].name : 'null')} voting #{params[:choice][:value]}"
+			logger.info "#{session[:person_id]} voting #{params[:choice][:value]}"
 		end
 
 		vote.publish
 		@elt.add_child vote
-		expire_fragment :action => 'show', :id => @elt.id
 
 		render :partial => '/elt/choice', :locals => { :elt => @elt }
 	end
+
+	def choices
+		@elt = Elt.find params[:id]
+	rescue ActiveRecord::RecordNotFound => e
+		render :status => 404, :file => "#{RAILS_ROOT}/public/404.html"
+	end
 end

data/app/controllers/subscriber_controller.rb

@@ -6,19 +6,20 @@
 class SubscriberController < ApplicationController
   def subscribe
     @elt = Elt.find params[:id]
+    @person = Person.find(session[:person_id])
 
-		if session[:person]
-			if @elt.subscribers.include?(session[:person])
-				Subscription.find_by_person_id_and_elt_id(session[:person].id, @elt.id).destroy
-				logger.info yellow { "User #{session[:person].name} unsubscribed from #{@elt.subject}..." }
-			elsif @elt.all_recipients.include?(session[:person])
+		if @person
+			if @elt.subscribers.include?(@person)
+				Subscription.find_by_person_id_and_elt_id(@person.id, @elt.id).destroy
+				logger.info yellow { "User #{@person.name} unsubscribed from #{@elt.subject}..." }
+			elsif @elt.all_recipients.include?(@person)
 				elt2 = @elt
-				elt2 = elt2.parent until elt2.subscribers.include?(session[:person])
-				Subscription.find_by_person_id_and_elt_id(session[:person].id, elt2.id).destroy
-				logger.info yellow { "User #{session[:person].name} unsubscribed from #{elt2.subject}..." }
+				elt2 = elt2.parent until elt2.subscribers.include?(@person)
+				Subscription.find_by_person_id_and_elt_id(@person.id, elt2.id).destroy
+				logger.info yellow { "User #{@person.name} unsubscribed from #{elt2.subject}..." }
 			else
-				@elt.subscriptions.create :person => session[:person], :filter => filter
-				logger.info yellow { "User #{session[:person].name} subscribed to #{@elt.id} with filter #{filter}..." }
+				@elt.subscriptions.create :person => @person, :filter => filter
+				logger.info yellow { "User #{@person.name} subscribed to #{@elt.id} with filter #{filter}..." }
 			end
 		else
 			puts "Not logged in!"

data/app/helpers/application_helper.rb

@@ -1,4 +1,17 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
-	include LoginEngine
+	def link_to(*args, &block)
+		if (request.subdomains[0] \
+				and args[1][:id] \
+				and (args[1][:id] == request.subdomains[0] \
+						 or (args[1][:id].class == Elt and args[1][:id].id == request.subdomains[0])))
+			args[1][:id] = ''
+		elsif ! request.subdomains[0] \
+			and args[1][:id].class == Elt \
+			and args[1][:id].id == Elt.find(:first, :conditions => "parent_id = 'ROOT'", :order => 'created_on').id
+			args[1][:id] = ''
+		end
+
+		super(*args)
+	end
 end

data/app/helpers/elt_helper.rb

@@ -61,14 +61,16 @@ module EltHelper
 			'\1\3\3* <a class="readMore" href="#" onclick="Element.hide(this.parentNode.parentNode); Element.removeClassName(this.parentNode.parentNode.nextSibling.nextSibling, \'tooLarge\'); return false;">Read more... / Lire plus...</a>\3\3<div class="tooLarge">\3\3\2</div>') \
 			if data and text.strip =~ /(?:(?:^\*\s+.+$\n){#{NB_PARAGRAPH_TO_DISPLAY*2+2}})/
 
-		#hard_breaks = true
 		textiled = text.blank? ? "" : RedCloth.new(text)
-		begin
-			textiled = textiled.to_html if !textiled.blank?
-		rescue
-			# TODO discover why RedCloth fails on this!!!
-			textiled = textiled.gsub(/[->\[]/, ' ')
-			textiled = textiled.to_html
+		if !textiled.blank?
+			begin
+				textiled.hard_breaks = false 
+				textiled = textiled.to_html
+			rescue
+				# TODO discover why RedCloth fails on this!!!
+				textiled = textiled.gsub(/[->\[]/, ' ')
+				textiled = textiled.to_html
+			end
 		end
 		if ! textiled.match(/[.\s]<p>/) and textiled.size < 200 then
 			# Remove any leading and finishing <p> </p> as they are not required

data/app/models/elt.rb

@@ -17,6 +17,7 @@
 #
 class Elt < ActiveRecord::Base
 	belongs_to :person
+
 	has_one :mail, :dependent => :destroy
 
 	has_many :choices, :dependent => :destroy, :order => "choices.created_on"
@@ -44,9 +45,9 @@ class Elt < ActiveRecord::Base
 
 	def all_subscriptions
 		if parent
-      (subscriptions + parent.all_subscriptions).uniq
+			(subscriptions + parent.all_subscriptions).uniq
 		else
-      subscriptions
+			subscriptions
 		end
 	end
 
@@ -78,39 +79,39 @@ class Elt < ActiveRecord::Base
 
 		parent.vote Regexp.last_match(1), person if body =~ /^\s*(-1|0|\+1)(\s|$)/
 		if Regexp.last_match(1) and self.body.gsub(/(-1|0|\+1)/, '').strip.empty?
-      # Hide simple votes
+			# Hide simple votes
 			vote -1
 		else
 			vote if person
 		end
 
-    parent.add_child(self) unless lft or rgt
+		parent.add_child(self) unless lft or rgt
 		true
 	end
 
-  def before_create
-    # Let's generate a nice looking id
-    self.id ||= new_id =
-      subject.gsub(/\[[\w-]*\]/, '').strip \
-      .gsub(/\s/, '_').gsub(/[^\w]+/, '') \
-      .gsub(/_+/, '_').gsub(/(^_|_$)/, '') if subject
-    self.id ||= "elt"
+	def before_create
+		# Let's generate a nice looking id
+		self.id ||= new_id =
+			subject.gsub(/\[[\w-]*\]/, '').strip \
+			.gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+			.gsub(/_+/, '_').gsub(/(^_|_$)/, '') if subject
+		self.id ||= "elt"
 
-    i = 0
-    self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
-  end
+		i = 0
+		self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
+	end
 
 	def add_child(c)
-    result = super(c)
-    p = c
-    while p
-      if !p.last_activity or p.last_activity < c.created_on then
-        p.last_activity = c.created_on
-        p.save!
-      end
-      p = p.parent
-    end
-    result
+		result = super(c)
+		p = c
+		while p
+			if !p.last_activity or p.last_activity < c.created_on then
+				p.last_activity = c.created_on
+				p.save!
+			end
+			p = p.parent
+		end
+		result
 	end
 
 	#

data/app/models/mail.rb

@@ -30,17 +30,17 @@ class Mail < ActiveRecord::Base
 		end
 	end
 
-  def before_create
-    # Let's generate a nice looking id
-    self.id ||= new_id =
-      message.gsub(/\[[\w-]*\]/, '').strip \
-      .gsub(/\s/, '_').gsub(/[^\w]+/, '') \
-      .gsub(/_+/, '_').gsub(/(^_|_$)/, '') if message
-    self.id ||= "mail"
-
-    i = 0
-    self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
-  end
+	def before_create
+		# Let's generate a nice looking id
+		self.id ||= new_id =
+			message.gsub(/\[[\w-]*\]/, '').strip \
+			.gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+			.gsub(/_+/, '_').gsub(/(^_|_$)/, '') if message
+		self.id ||= "mail"
+
+		i = 0
+		self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
+	end
 
 	"""                  _           
 		 _ __ ___  ___ ___(_)_   _____ 
@@ -60,7 +60,13 @@ class Mail < ActiveRecord::Base
 		logger.info "Receive mail #{mail.message_id}"
 		self.mail_parents = mail.references
 		self.message = mail.message_id
-		self.file = mail.encoded
+		if mail.encoded.isutf8
+			self.file = mail.encoded
+		else
+			charset = mail.type_param 'charset'
+			charset ||= 'iso-8859-1'
+			self.file = Iconv.iconv('utf-8', charset, mail.encoded).to_s
+		end
 
 		build_elt :created_on => mail.date,
 			:subject => unquote(mail.subject),
@@ -106,19 +112,18 @@ class Mail < ActiveRecord::Base
 			logger.info "Creating a parent elt with id #{parentId}"
 			#puts "Creating a parent elt with id #{parentId}"
 			elt.build_parent :parent_id => 'mail', :subject => parentId, :body => ''
-			elt.parent.id = parentId
 			elt.parent.publish
-			elt.save
 		end
 
+		elt.save!
 		mngAttachment mail if mail
 
 		elt.person = Person.find_by_email(mail.from) \
 			|| Person.find_by_name(unquote(mail.friendly_from)) \
 			|| elt.build_person(:id =>  unquote(mail.friendly_from).gsub(/\s/, '_'),
 													:name => unquote(mail.friendly_from),
-													:email => mail.from.first) \
-			if not mail.from.first.match(/#{ANONYMOUS_POSTER}@#{ActionMailer::Base.smtp_settings[:domain]}/)
+													:email => mail.from.first
+												 ) unless mail.from.first.match(/#{ANONYMOUS_POSTER}@#{ActionMailer::Base.smtp_settings[:domain]}/)
 
 		elt.publish
 
@@ -139,8 +144,8 @@ class Mail < ActiveRecord::Base
 	# An elt needs to be published as a mail
 	#
 	def publish
-		logger.info "Publish mail for elt #{elt.subject} [#{elt.id}]"
-		#puts "Publish mail for elt #{elt.subject} [#{elt.id}]"
+		logger.info "Publish mail for elt '#{elt.subject}' [#{elt.id}]"
+		#puts "Publish mail for elt '#{elt.subject}' [#{elt.id}]"
 
 		if message and not message.blank? and file
 			mail = TMail::Mail.parse file
@@ -153,25 +158,18 @@ class Mail < ActiveRecord::Base
 			self.file = mail.encoded
 		end
 
-		mail['Precedence'] = 'list'
-		mail['X-Loop'] = ActionMailer::Base.smtp_settings[:domain]
-		mail['List-Archive'] = "http://"+ActionMailer::Base.smtp_settings[:domain]
-		mail['Errors-To'] = "errors@"+ActionMailer::Base.smtp_settings[:domain]
-
-		subscriptions = elt.all_subscriptions \
+		# Record all people to whom it was sent
+		mail.bcc = elt.all_subscriptions \
 			.select { |s| s.person.email and not s.person.email.blank? } \
 			.select { |s| #puts "Person: #{s.person.name}, elt: #{s.elt.id}, filter: #{s.filter}";
 				not s.filter or (elt.result and elt.result >= s.filter) } \
 			.reject { |s| recipients.include? s.person } \
+			.uniq \
+			.each { |r| person_mails.build :person => r.person } \
+			.collect { |i| i.person.email } \
 			.uniq
 
-		# Record all people to whom it was sent
-		subscriptions.each { |r| person_mails.create :person => r.person }
-		# mostly because otherwise the tests don't see it
-		person_mails.reload
-		recipients.reload
-
-		mail.bcc = subscriptions.collect { |i| i.person.email }.uniq.join(', ')
+		logger.info "Recipients: #{recipients}"
 		#puts "mail.bcc: #{mail.bcc}"
 
 		#
@@ -192,6 +190,11 @@ class Mail < ActiveRecord::Base
 
 		# Added to make sure it is not lost, but not modified if already existant
 		mail['X-Message-Id'] = mail.message_id if not mail['X-Message-Id']
+		mail['Precedence'] = 'list'
+		mail['X-Loop'] = ActionMailer::Base.smtp_settings[:domain]
+		mail['Errors-To'] = "errors@"+ActionMailer::Base.smtp_settings[:domain]
+		mail['List-Archive'] = "http://"+ActionMailer::Base.smtp_settings[:domain]
+		mail['Parlement-elt-id'] = elt.id
 
 		if mail.message_id
 			# Let's not change the message id
@@ -223,30 +226,24 @@ class Mail < ActiveRecord::Base
 		elsif attachment.disposition_param 'filename'
 			File.open("/tmp/#{attachment.disposition_param('filename')}", 'w') { |file|
 				file << attachment.body
-				elt.attachments.build :file => file, :content_type => attachment.content_type
+				att = elt.attachments.build :file => file, :content_type => attachment.content_type
+				att.save!
 			}
 		elsif attachment.type_param 'name'
 			File.open("/tmp/#{attachment.type_param('name')}", 'w') { |file|
 				file << attachment.body
-				elt.attachments.build :file => file, :content_type => attachment.content_type
+				att = elt.attachments.build :file => file, :content_type => attachment.content_type
+				att.save!
 			}
 		elsif (attachment.content_type and attachment.content_type.match(/text\/plain/)) \
 			or (!attachment.content_type and attachment.parts.size == 0)
-			charset = attachment.type_param 'charset'
-			if charset and !charset.empty?
-				if attachment.transfer_encoding == 'quoted-printable'
-					# Here to correct a null character which can occur in some mails
-					# It looks like ==0 or ^@ !!!
-					# Otherwise the elt can not be saved in the db :(
-					elt.body += Iconv.new(charset, 'iso-8859-1').iconv(attachment.body).gsub(/\0/, '')
-				elsif !charset =~ 'uft-8'
-					elt.body += Iconv.new(charset, 'iso-8859-1').iconv(attachment.body)
-				else
-					elt.body += attachment.body
-				end
+			# Here too have to remove any eventual null character!
+			if attachment.body.isutf8
+				elt.body += attachment.body
 			else
-				# Here too have to remove any eventual null character!
-				elt.body += attachment.body.gsub(/\0/, '')
+				charset = attachment.type_param 'charset'
+				charset = 'iso-8859-1' unless charset and charset != 'utf-8'
+				elt.body += Iconv.iconv('utf-8', charset, attachment.body).to_s
 			end
 		end
 	end