From mboxrd@z Thu Jan 1 00:00:00 1970 From: marcus-sup@bar-coded.net (Marcus Williams) Date: Tue, 15 Jan 2008 14:02:27 +0000 Subject: [sup-talk] [PATCH] Fix for some warnings on faked addresses and ids In-Reply-To: <1200248339-sup-5704@tomsk> References: <1200049520-sup-6114@tomsk> <1200191029-sup-8287@south> <1200248339-sup-5704@tomsk> Message-ID: <1200405667-sup-9034@tomsk> Fixes a few unitialised variable warnings when logging faked message addresses or faked message ids. Also initialises the @lines var when the message is not text. --- lib/sup/message-chunks.rb | 1 + lib/sup/message.rb | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb index 2fcf8f9..08dcf27 100644 --- a/lib/sup/message-chunks.rb +++ b/lib/sup/message-chunks.rb @@ -82,6 +82,7 @@ EOS :sibling_types => sibling_types end + @lines = nil if text @lines = text.gsub("\r\n", "\n").gsub(/\t/, " ").gsub(/\r/, "").split("\n") @quotable = true diff --git a/lib/sup/message.rb b/lib/sup/message.rb index 65aebd5..bd37162 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -60,25 +60,28 @@ class Message def parse_header header header.each { |k, v| header[k.downcase] = v } - + + fakeid = nil + fakename = nil + @id = if header["message-id"] sanitize_message_id header["message-id"] else - returning("sup-faked-" + Digest::MD5.hexdigest(raw_header)) do |id| - Redwood::log "faking message-id for message from #@from: #{id}" - end + fakeid = "sup-faked-" + Digest::MD5.hexdigest(raw_header) end @from = if header["from"] PersonManager.person_for header["from"] else - name = "Sup Auto-generated Fake Sender " - Redwood::log "faking from for message #@id: #{name}" - PersonManager.person_for name + fakename = "Sup Auto-generated Fake Sender " + PersonManager.person_for fakename end + Redwood::log "faking message-id for message from #@from: #{id}" if fakeid + Redwood::log "faking from for message #@id: #{fakename}" if fakename + date = header["date"] @date = case date -- 1.5.3.7