after5: after5.rb comparison

comparison after5.rb @ 42:07ef43ac4f15 draft

Some ruby-1.9 workarounds and enhancement to logging and messaging.

author	HIROSE Yuuji <yuuji@gentei.org>
date	Tue, 08 May 2012 00:04:52 +0900
parents	c4e517ccfd99
children	7874392b872d

comparison

equal deleted inserted replaced

-:c4e517ccfd99
+:07ef43ac4f15
 # -*- coding: euc-jp -*-
 #
 # 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 Mon May  7 01:18:59 2012 on firestorm
+# Last modified Mon May  7 23:58:40 2012 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 $hgid = <<_HGID_.split[1..-2].join(" ")
 $HGid$
 _HGID_
 a = array[i%array.length]
 a[rand(a.length), 1]
 }.join('')
 end
 def users()
-@pdb.keys
+@pdb.keys.collect{|u| u.toeuc} # toeuc is for 1.9 :(
 end
 private :newpasswd
 def setnewpasswd(user, length=8)
 newp = newpasswd(length)
 setpasswd(user, newp)
 if (list = Dir.glob(path))[0]
 for p in list
 	p.untaint
 	system "/bin/rm -rf \"#{p}\""
 end
-cleanup_files(list[0])
+cleanup_files(list)
 end
 end
 def account_exists(instance)
 if /@/ =~ instance
 true
 # Do not mkdir `path' for
 #	absolute paths
 #   those paths which contains `../'
 # for the sake of security reason
 return false if %r,\.\./|^/, =~ path
+path = path.untaint
 p = 0
 i=0
 while p=path.index("/", p)
 dir = path[0..p].chop
 p += 1
 	'management'	=> ['管理', 'management'],
 	'administrator'	=> ['管理者', 'Administrator'],
 	'newgroup'	=> ['新規グループ作成', 'Create new group'],
 	'adminop'	=> ['管理<br>操作', "Administrative<br>operation"],
 	'sendall'	=> ['一斉送信', "write to members"],
+'sendall_err'	=> ["%s ファイルで mailprefix と maildomain を定義しとかないと送れまへん。
+例: mailprefix=yuuji-after5
+maildomain=gentei.org
+さらに、.qmail-$mailprefix-default も以下のように用意しておこね。
+| ./#{@myname} -list",
+"You should define `mailprefix' and `maildomain' in %s file before
+sending message to all.
+(ex.) mailprefix=yuuji-after5
+maildomain=gentei.org
+And then prepare .qmail-$mailprefix-default file as below.
+| ./#{@myname} -list"],
 'sendall_head'	=> ['「%s」宛のメイル送信', "Send message to `%s'"],
 'sendall_note'	=> ['メンバーへの連絡だけでなく、グループ非加入者がこれから加入する旨の通知などにも有用。',
 "Send this message to all of group."],
 'sendall_done'	=> ['送信完了', "sending message done"],
 'body'		=> ['本文', 'Body'],
 def putLog(msg)
 msg += "\n" unless /\n/ =~ msg
 open(@opt["logfile"], "a+") {|lp|
 lp.print Time.now.to_s + " " + msg
 }
+msg
 end
 def sendnotify(whom, subj, body)
 users = users()
 if grepgroup(whom)
 #recipient.unshift "-f"+header['return-path'] if header['return-path']
 exec(ENV['MAILCMD'] || @opt['sendmail'], *recipient)
 end
 	exit 0;
 end
-putLog("Sent '#{subject}' to #{to}\n")
+putLog("Sent '#{subject.toeuc}' to #{to}\n")
 return true
 rescue
 putLog("FAILED! - Sent '#{subject}' to #{to}\n")
 return nil
 end
 exit 0
 end
 # ML functions
 def tagify_subj(body, tag)
+# This method should be generic for other headers than `Subject'?
 hold = []
 ret = []
 skip = false
 regexp = /^Subject: /
 while line = body.shift
 when /^\s/                # continued line
 hold << line
 else
 if skip then
 sj = hold.join.toeuc.sub("Subject: ", "").gsub(tag, "").strip
-sj = sj.sub(/^(re: *)+/i, "Re: ").gsub("\n", "").squeeze
+sj = sj.sub(/^(re: *)+/i, "Re: ").gsub("\n", "")
-ret << "Subject: "+NKF.nkf('-jM', tag+" "+sj)+"\n"
+ret << "Subject: "+NKF.nkf('-jM', tag+" "+sj).strip+"\n"
 else
 ret += hold
 end
 skip = false
 hold = [line]
 #  LOCAL=1 DEFAULT=name ./after5.rb -list
 # $DEFAULT is ML name
 viamail = ENV['LOCAL'] && ENV['DEFAULT'] # called via mail
 from = nil
 unless @opt['mailprefix'] && @opt['maildomain']
-STDERR.printf("Set mailprefix and maildomain in %s\n", @opt['conf'])
+if viamail
-STDERR.print "(ex.)  mailprefix=yuuji-after5\n"
+STDERR.print msg('sendall_err') % [@opt['conf']]
-STDERR.print "       maildomain=gentei.org\n"
+exit 0
-exit 0
+else
+@O.print @H.elementln("pre"){msg('sendall_err') % [@opt['conf']]}
+return true
+end
 end
 if viamail then
 prohibitviahttp()
 name = ENV['DEFAULT']
 else                        # via http
 exit 0
 end
 def listdraft(name)
 return nil unless checkauth
 return nil unless name
+unless @opt['mailprefix'] && @opt['maildomain']
+@O.print @H.elementln("pre"){msg('sendall_err') % [@opt['conf']]}
+return true
+end
 user=@params['user']
 nickname = @sc.nickname(user)
 @O.print @H.elementln("h1") {
 @mybase+' '+msg('sendall').sub("<br>", " ")
 }
 return nil
 end
 @O.print @H.elementln("h1"){
 msg('group')+" #{group} "+msg('deletion')
 }
-@O.print @H.p(@sc.destroygroup(group) ? msg("done") : msg("failure"))
+resmsg = @sc.destroygroup(group) ? msg("done") : msg("failure")
+@O.print @H.p(resmsg)
+putLog("Delete group '#{group}' #{resmsg}\n")
 @O.print footer()
 end
 def deleteuser(user)
 return nil
 end
 @O.print @H.elementln("h1"){
 msg('user')+" #{user} "+msg('deletion')
 }
-@O.print @H.p(deleteuser(user) ? msg("done") : msg("failure"))
+resmsg = deleteuser(user) ? msg("done") : msg("failure")
+@O.print @H.p(resmsg)
+putLog("Delete user '#{user}' #{resmsg}\n")
 @O.print @H.p(@H.a(@myname, msg('login')))
 end
 def admgroupsub()
 	    @O.print @H.p(sprintf(msg('soleadmin'), u, group))
 	  elsif joinp ^ membp
 	    somethingdone = true
 	    @sc.addgroup(group, [u], !joinp, kind[0])
 	    @O.print @H.elementln("p"){
-	      sprintf "%s [%s](%s) %s %s", msg('user'), u,
+	      putLog(sprintf "%s [%s](%s) %s %s", msg('user'), u,
-		msg(kind[1]),
+msg(kind[1]),
-		joinp ?  msg('addedtogroup'): msg('removedfromgp'), group
+joinp ?  msg('addedtogroup'): msg('removedfromgp'), group)
 	    }
 	  end
 	end
 end
 end # users()
 	membp = (@sc.ismember(g, group) && true)
 	if joinp ^ membp
 	  somethingdone = true
 	  @sc.addgroup(group, [g], !joinp)
 	  @O.print @H.elementln("p"){
-	    sprintf "%s [%s] %s %s", msg('group'), g,
+	    putLog(sprintf("%s [%s] %s %s",
-	      joinp ?  msg('addedtogroup'): msg('removedfromgp'), group
+msg('group'), g,
-	  }
+joinp ?
+msg('addedtogroup')
+: msg('removedfromgp'), group))
+}
 	end
 end
 end # groups
 unless somethingdone
 # @O.print @H.p(msg('nothingtodo'))
 end
 # @O.print footer()
 link2home
 end
 def newgroupsub()
-if !checkauth
+return nil unless checkauth
-nil
-end
 user = @params['user']
 newgroup = @params['group']
 newgname = @params['gname']
 if dupl=@sc.name2group(newgname)
 @O.print @H.p(sprintf(msg('dupname'), newgname))
 @O.print groupnamesString()
 return nil
 end
-@sc.creategroup(newgroup, newgname, [user])
+@sc.creategroup(newgroup, newgname, [user]) &&
+putLog("New group '#{newgroup}'(#{newgname}) created\n")
 admgroup(newgroup)
 end
 #
 # Methods Related to viaMail functions
 	@job = 'notify'	# + exit
 when "-list"
 	@job = 'list'	# + exit
 when "-newgroup"
 	@job = 'newgroup'
-when /^-(admgroup|listdraft)/
+when /^-(admgroup|listdraft)$/
 	ARGV.shift
 	gr = safecopy(grepgroup(ARGV[0]))
 	##gr.untaint
 	@job = safecopy($1)+' "'+gr+'"'
 when "-admgroupsub"
 	ARGV.shift
 	usr = safecopy(users().grep(ARGV[0])[0])
 	@job = 'delusersub "'+usr+'"'
 when "-delgroupsub"
 	ARGV.shift
-	gr = grepgroup(ARGV[0])
+	gr = safecopy(grepgroup(ARGV[0]))
 	@job = 'delgroupsub "'+gr+'"'
 when /-(setpasswd|deluser|adduser)$/
 	ARGV.shift
 	@job = $1+ " '#{ARGV[0]}'" # + exit
 when ""

Mercurial > hgrepos > hgweb.cgi > after5

comparison after5.rb @ 42:07ef43ac4f15 draft