summaryrefslogtreecommitdiff
path: root/lib/feed2imap/itemtomail.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/feed2imap/itemtomail.rb')
-rw-r--r--lib/feed2imap/itemtomail.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/feed2imap/itemtomail.rb b/lib/feed2imap/itemtomail.rb
index 9d1cbad..f2c5616 100644
--- a/lib/feed2imap/itemtomail.rb
+++ b/lib/feed2imap/itemtomail.rb
@@ -43,8 +43,15 @@ end
def item_to_mail(item, index, updated, from = 'Feed2Imap')
message = RMail::Message::new
- message.header['From'] = "#{from} <feed2imap@feed2imap.net>"
- message.header['To'] = "#{from} <feed2imap@feed2imap.net>"
+ if item.creator and item.creator != ''
+ if item.creator.include?('@')
+ message.header['From'] = item.creator.chomp
+ else
+ message.header['From'] = "#{item.creator.chomp} <feed2imap@acme.com>"
+ end
+ else
+ message.header['To'] = "#{from} <feed2imap@acme.com>"
+ end
if @date.nil?
message.header['Date'] = Time::new.rfc2822
else
9f92a23b9f&follow=1'>Add head comment to ui-commit.cLars Hjemli1-0/+8 2006-12-16gitweb ripoff: set tr:hover to highligt current rowLars Hjemli1-3/+7 2006-12-16Make repo header a link to summary pageLars Hjemli2-1/+12 2006-12-16Move cgit_print_date into ui-shared, reuse in ui-summaryLars Hjemli4-20/+24 2006-12-16Add ui-commit.c + misc ui cleanupsLars Hjemli9-19/+140 2006-12-15Add a common commit parserLars Hjemli3-63/+75 2006-12-14Add simple pager to log pageLars Hjemli4-6/+37 2006-12-13Add separate makefile-rule to clear current cacheLars Hjemli1-2/+4 2006-12-13Remove implementation details from READMELars Hjemli1-53/+34 2006-12-13Small layout adjustments to summary and blob viewLars Hjemli3-5/+13 2006-12-13Add display of tree content w/ui-tree.cLars Hjemli9-8/+113 2006-12-12cache_lock: do xstrdup/free on lockfileLars Hjemli1-1/+2 2006-12-11Don't truncate valid cachefilesLars Hjemli3-4/+16 2006-12-11Move global variables + callback functions into shared.cLars Hjemli4-82/+86 2006-12-11Move functions for generic object output into ui-view.cLars Hjemli4-34/+43 2006-12-11Move log-functions into ui-log.cLars Hjemli5-111/+121 2006-12-11Move repo summary functions into ui-summary.cLars Hjemli4-47/+59 2006-12-11Move functions for repolist output into ui-repolist.cLars Hjemli5-70/+90 2006-12-11Move common output-functions into ui-shared.cLars Hjemli4-82/+99 2006-12-11Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.cLars Hjemli4-28/+29 2006-12-11Avoid infinite loops in caching layerLars Hjemli3-14/+31 2006-12-11Let 'make install' clear all cachefilesLars Hjemli1-0/+2 2006-12-11Fix cache algorithm loopholeLars Hjemli3-11/+16 2006-12-10Add version identifier in generated filesLars Hjemli2-9/+14 2006-12-10Add license file and copyright noticesLars Hjemli5-0/+372 2006-12-10Add caching infrastructureLars Hjemli9-28/+353