after5: after5.rb comparison

comparison after5.rb @ 69:bdb7e40c2d4f draft

`limitsender' option to prohibit anonymous user to send to ML

author	HIROSE Yuuji <yuuji@gentei.org>
date	Thu, 28 Jun 2012 11:56:34 +0900
parents	db1502243712
children	2e293d4d8db4

comparison

equal deleted inserted replaced

-:db1502243712
+:bdb7e40c2d4f
 # -*- 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 Thu Jun 28 09:42:37 2012 on firestorm
+# Last modified Thu Jun 28 11:51:17 2012 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 $hgid = <<_HGID_.split[1..-2].join(" ")
 $HGid$
 _HGID_
 	next unless test(?s, file) && test(?r, file)
 	map[u][attr] = IO.readlines(file).join.toeuc.strip
 }
 }
 map
+end
+def ismembersemail(email)
+@usermap.keys.each {|u|
+return u if u==email
+return u if mailaddress(u).split(/,\s*|\s+/).grep(email)[0]
+}
+nil
 end
 def putuserattr(user, attr, text)
 # if text==nil, remove it
 d = File.join(@usermapdir, user)
 Dir.mkdir(d) unless test(?d, d)
 phones tend to return only from: address.'],
 'inviteonly'	=> ['管理者のみ加入操作可能',
 'Only administrators can add new members.'],
 'invite-error'	=> ['%s への加入はグループ管理者のみが操作できます。',
 "Only administrator of this group(`%s') can add you."],
+'limitsender'	=> ['アカウント保持者のみ送信可能',
+'Allow only account holders to post to ML'],
 	'personal'	=> ['個人で', 'personal'],
 	'registas'	=> ['グループ予定として登録?', 'Register as group?'],
 'headsched'	=> ['下の枠内に予定を記入: 1行以内で短めに。
 長くなるときは2行目以降に詳細を。',
 'Put shortest sentence as possible within 1 line.
 bracket = @sc.getgroupattr(name, 'subjtag') || @params['mailbracket']
 fromhack = @sc.getgroupattr(name, 'fromhack')
 mldir = "ml/"+name
 to = @sc.getgroupattr(name, 'mladdress') || defaultmladdress(name)
 returnpath = to.sub("@", @mailadmsuffix+"-@")
+adminaddr  = to.sub("@", @mailadmsuffix+"@")
 subj = @params['subject'] || "Message from "+@myname
 sjtag = bracket.gsub("%n", nickname(name)).
 gsub("%i", name).
 gsub(/%(\d*)c/){("%0"+$1+"d") % [mlseq(mldir)]}
 tagpt = Regexp.quote(bracket). # compute bracket pattern
 rcpts = if grepgroup(name)
 @sc.members(name)
 else
 [name]
 end.collect {|u| mailaddress(u, name).split(/,\s*|\s+/)}.flatten
+ENV["QMAILINJECT"] = "r"    # for ML mode, use verp
+#
+# On mail mode, check if sender can send message to list.
+if viamail && @sc.getgroupattr(name, 'limitsender')
+s = ENV['SENDER']
+if !catch(:senderok) {
+throw :senderok, true if rcpts.grep(s)[0]
+throw :senderok, true if @sc.ismembersemail(s)
+}
+# sender is not allowed to send to ML
+sendMail(s, "You are not allowed to send to this ML",
+("Before posting to this list(%s),\n"+
+"subscribe to %s") % [to, @opt['url']],
+adminaddr, nil, {"Return-path" => returnpath})
+exit 0
+end
+end
 # p rcpts
 # p to
-ENV["QMAILINJECT"] = "r"    # for ML mode, use verp
 sendMail(to, subj, body, from, rcpts,
 header,
 ENV['SENDER'],
 @opt['mlspooling'] ? mldir : nil)
 if !viamail then
 }
 }
 }.join
 }
 } + \
-["fromhack", "inviteonly"].collect do |param|
+["fromhack", "inviteonly", "limitsender"].collect do |param|
 @H.checkbox(param, "yes", msg(param),
 @sc.getgroupattr(group, param)) + "<br>\n"
 end.join + \
 (group ? @H.elementln("p") {
 sprintf(msg('mladdress'), defaultmladdress(group)) + \
 	end
 end
 end # groups
 # Change parameter(s)
 # To be more generic...
-["fromhack", "inviteonly"].each {|param|
+["fromhack", "inviteonly", "limitsender"].each {|param|
 parsetp = (@params[param] && /^yes/i =~ @params[param])
 cursetp = (@sc.getgroupattr(group, param)!=nil)
 if cursetp ^ parsetp
 @sc.putgroupattr(group, param, @params[param])
 @O.print @H.elementln("p") {

Mercurial > hgrepos > hgweb.cgi > after5

comparison after5.rb @ 69:bdb7e40c2d4f draft