# HG changeset patch # User HIROSE Yuuji # Date 1336315257 -32400 # Node ID 39da23b2edb9a9028b87c47fb642ac1a4d972adb # Parent 1515ea889ea1ea34d28f7a470ed6a2fc9fbb9762 Prepend bracket tag to subject. diff -r 1515ea889ea1 -r 39da23b2edb9 after5.rb --- a/after5.rb Sun May 06 22:24:32 2012 +0900 +++ b/after5.rb Sun May 06 23:40:57 2012 +0900 @@ -4,7 +4,7 @@ # Associative Scheduling Table - after5 # (C)2003, 2004, 2006, 2008, 2012 by HIROSE Yuuji [yuujigentei.org] # $Id: after5.rb,v 1.19 2012/04/01 11:52:25 yuuji Exp yuuji $ -# Last modified Sun May 6 21:41:14 2012 on firestorm +# Last modified Sun May 6 23:38:27 2012 on firestorm # See http://www.gentei.org/~yuuji/software/after5/ # このスクリプトはEUCで保存してください。 $hgid = <<_HGID_.split[1..-2].join(" ") @@ -1054,6 +1054,7 @@ 'pswddb' => 's/a5pswd', 'lang' => 'j', 'notifymail' => true, + 'mailbracket' => '[%s]', } @ntlist = [ ['nt10m', "10"+msg('minutes', 'before')], @@ -2538,6 +2539,15 @@ end to = sprintf("%s-%s@%s", @opt['mailprefix'], name, @opt['maildomain']) subj = @params['subject'] || "Message from "+@myname + sjtag = sprintf(@opt['mailbracket'], nickname(name)) + subj = sjtag.strip+" "+subj.gsub(sjtag, "") + header = { + "Reply-to" => to, + "X-ML-Driver" => $hgid, + "X-ML-Driver-URI" => $myurl, + "X-ML-Name" => name, + "Errors-to" => @opt['maintainer'], + "Return-path" => @opt['maintainer']} Dir.chdir @mydir rcpts = if grepgroup(name) @sc.members(name) @@ -2547,16 +2557,12 @@ # p rcpts # p to sendMail(to, subj, body, from, rcpts, - { "Reply-to" => to, - "X-ML-Driver" => $hgid, - "X-ML-Driver-URI" => $myurl, - "X-ML-Name" => name, - "Errors-to" => @opt['maintainer'], - "Return-path" => @opt['maintainer']}, + header, ENV['SENDER']) if !viamail then @O.print @H.elementln("h1"){msg('sendall_done')} - @O.print @H.p(sprintf(msg('sendall_head'), name)+" "+msg('done')) + @O.print @H.p(sprintf(msg('sendall_head'), + nickname(name))+" "+msg('done')) link2home() @O.print footer() return true