From c799e4184c3f14e7770afa514621c72ebc408c52 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 28 Jan 2013 10:55:37 +1100 Subject: Calling TMail::Mail#base64_decode does not modify the mail object so doesn't do anything as used here --- script/handle-mail-replies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 73fca33c3..4e35ee0cf 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -30,7 +30,7 @@ def main(in_test_mode) Dir.chdir($alaveteli_dir) do raw_message = $stdin.read begin - message = MailHandler.mail_from_raw_email(raw_message, decode=false) + message = MailHandler.mail_from_raw_email(raw_message) rescue # Error parsing message. Just pass it on, to be on the safe side. forward_on(raw_message) unless in_test_mode -- cgit v1.2.3 From cbdff06aa95a7987b54c712dc6729e138f608eca Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Sun, 3 Mar 2013 14:52:30 +1100 Subject: Rename Configuration class to avoid conflict with ActiveSupport::Configurable --- script/handle-mail-replies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 4e35ee0cf..f5d34d796 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -165,7 +165,7 @@ def is_oof?(message) end def forward_on(raw_message) - IO.popen("/usr/sbin/sendmail -i #{Configuration::forward_nonbounce_responses_to}", "w") do |f| + IO.popen("/usr/sbin/sendmail -i #{AlaveteliConfiguration::forward_nonbounce_responses_to}", "w") do |f| f.write(raw_message); f.close; end -- cgit v1.2.3 From e1c8699be581a72dbe157f6c5d8b4517aec4d7dc Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Mar 2013 10:54:24 +1100 Subject: Stop AlaveteliConfiguration class being loaded twice --- script/handle-mail-replies.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index f5d34d796..23430e20a 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -14,12 +14,8 @@ # config file ourselves. $alaveteli_dir = File.expand_path(File.join(File.dirname(__FILE__), '..')) $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) -load "config.rb" $:.push(File.join($alaveteli_dir, "lib")) $:.push(File.join($alaveteli_dir, "lib", "mail_handler")) -require "configuration" -MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) -MySociety::Config.load_default require 'mail_handler' if RUBY_VERSION.to_f >= 1.9 # the default encoding for IO is utf-8, and we use utf-8 internally -- cgit v1.2.3 From 6124624f4035e74eb79f1e93f26d5584ed3e2fa1 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 30 Apr 2013 15:40:37 +0100 Subject: Remove setting of internal and external encodings for ruby 1.9 - as per 512d8e3d1845e327740acc2f7326e72b23d0d604, this is already the default in Rails 3. --- script/handle-mail-replies.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 23430e20a..7a68e22e3 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -17,10 +17,6 @@ $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) $:.push(File.join($alaveteli_dir, "lib")) $:.push(File.join($alaveteli_dir, "lib", "mail_handler")) require 'mail_handler' -if RUBY_VERSION.to_f >= 1.9 - # the default encoding for IO is utf-8, and we use utf-8 internally - Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 -end def main(in_test_mode) Dir.chdir($alaveteli_dir) do -- cgit v1.2.3 From cb87eeb053257e34c5af67f52689cd4d7dd37d1a Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 8 May 2013 10:52:05 +0100 Subject: Restore load of config (AlaveteliConfiguration is required in forward_on) - update config to avoid redefinition of constant warnings. --- script/handle-mail-replies.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 7a68e22e3..be6bd10da 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -14,8 +14,12 @@ # config file ourselves. $alaveteli_dir = File.expand_path(File.join(File.dirname(__FILE__), '..')) $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) +load 'config.rb' $:.push(File.join($alaveteli_dir, "lib")) $:.push(File.join($alaveteli_dir, "lib", "mail_handler")) +load 'configuration.rb' +MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) +MySociety::Config.load_default require 'mail_handler' def main(in_test_mode) -- cgit v1.2.3 From 104bc0d44391b1f819eb7dbe86eb320bd52f3f38 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 28 May 2013 13:45:54 +0100 Subject: Revert "Remove setting of internal and external encodings for ruby 1.9 - as per 512d8e3d1845e327740acc2f7326e72b23d0d604, this is already the default in Rails 3." <- Although this is the default in Rails, Rails isn't loaded at this point in the script. This reverts commit 6124624f4035e74eb79f1e93f26d5584ed3e2fa1. --- script/handle-mail-replies.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index be6bd10da..da0fc8e96 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -21,6 +21,10 @@ load 'configuration.rb' MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default require 'mail_handler' +if RUBY_VERSION.to_f >= 1.9 + # the default encoding for IO is utf-8, and we use utf-8 internally + Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 +end def main(in_test_mode) Dir.chdir($alaveteli_dir) do -- cgit v1.2.3