changeset 38:39da23b2edb9 draft

Prepend bracket tag to subject.
author HIROSE Yuuji <yuuji@gentei.org>
date Sun, 06 May 2012 23:40:57 +0900
parents 1515ea889ea1
children 338cd77f85a7
files after5.rb
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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 [yuuji<at>gentei.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

yatex.org