Various UI bit fixes for new storage format

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/helpers.rb b/lib/helpers.rb
index 525dd93..5b4d2e3 100644
--- a/lib/helpers.rb
+++ b/lib/helpers.rb
@@ -42,8 +42,9 @@ helpers do
     ERB::Util::url_encode(text)
   end
 
-  def strip_email_domain(str)
-    str.split(/,\s*/).map do |email|
+  # This method strips domains from header fields.
+  def strip_email_headers(ary)
+    [ary].flatten.map do |email|
       email.gsub(/@(.*?)(>|$)/) do |s|
         if $1 == 'gentoo.org'
           "@g.o#{$2}"
@@ -53,21 +54,20 @@ helpers do
           "@#{'×' * $1.length}#{$2}"
         end
       end
-    end.join(', ')
+    end
   end
 
+  # This method is meant to strip emails from free text, not header fields
   def strip_email(str)
-    str.split(/,\s*/).map do |email|
-      email.gsub(/([a-zA-Z0-9._%+-]+)@([a-zA-Z0-9.-]+)\.([a-zA-Z]{2,10})/) do |s|
-        if $2 == 'gentoo' and $3 == 'org'
-          "#{$1}@g.o"
-        elsif $2 == 'lists.gentoo' and $3 == 'org'
-          "#{$1}@l.g.o"
-        else
-          "#{$1}@#{'×' * $2.length}.#{$3}"
-        end
+    str.gsub(/([a-zA-Z0-9._%+-]+)@([a-zA-Z0-9.-]+)\.([a-zA-Z]{2,10})/) do |s|
+      if $2 == 'gentoo' and $3 == 'org'
+        "#{$1}@g.o"
+      elsif $2 == 'lists.gentoo' and $3 == 'org'
+        "#{$1}@l.g.o"
+      else
+        "#{$1}@#{'×' * $2.length}.#{$3}"
       end
-    end.join(', ')
+    end
   end
 
   def linkize(str)