diff --git a/apply/appjd.rb b/apply/appjd.rb index 5f6dc7f..d70f500 100755 --- a/apply/appjd.rb +++ b/apply/appjd.rb @@ -66,7 +66,9 @@ # For applicant table = open("mailtmpl.html"){|h| h.read}.force_encoding('utf-8') -table.gsub!(/__(\w+)__/){|k| CGI.escapeHTML(c[$1.downcase].read)} +table.gsub!(/__(\w+)__/) {|k| + CGI.escapeHTML(NKF.nkf('-wZ', c[$1.downcase].read)) +} require "tmpdir" Dir.mktmpdir {|tmp| @@ -88,14 +90,14 @@ end csv = File.expand_path(uid+".csv", tmp) CSV.open(csv, "w") do |data| - keys = c.params.keys.reject {|x| ["recfile", "submit"].index(x)} + keys = c.params.keys.reject {|x| ["nptn", "recfile", "submit"].index(x)} data << keys - data << keys.collect{|k| c.params[k][0]} + data << keys.collect{|k| NKF.nkf('-wZ', c.params[k][0])} end cmd = "| ./sendmultipart.sh -t #{rcpt} -s '#{sj}' -f '#{fr}' '#{csv}'" cmd += " '#{file}'" if file > "" open(cmd, "w") do |m| - m.print body + m.print NKF.nkf('-wZ0', body) end }