after5: after5.rb comparison

comparison after5.rb @ 17:904bbce89e71 draft

RCS-revision 1.18 date: 2012/04/01 05:18:57; author: yuuji; state: Exp; lines: +37 -36 Boring hack for ruby19 encoding issue Guidance message little bit informative

author	HIROSE Yuuji <yuuji@gentei.org>
date	Sun, 01 Apr 2012 05:18:57 +0859
parents	1ff30d4c58ce
children	399f24a71eb9

comparison

equal deleted inserted replaced

-:1ff30d4c58ce
+:904bbce89e71
-#!/usr/local/bin/ruby
+#!/usr/local/bin/ruby19
 # -*- coding: euc-jp -*-
 #
 # Associative Scheduling Table - after5
 # (C)2003, 2004, 2006, 2008 by HIROSE Yuuji [yuuji@gentei.org]
-# $Id: after5.rb,v 1.17 2009/09/17 09:09:23 yuuji Exp $
+# $Id: after5.rb,v 1.18 2012/04/01 05:18:57 yuuji Exp $
-# Last modified Thu Sep 17 18:08:23 2009 on spada
+# Last modified Sun Apr  1 14:17:05 2012 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 require 'kconv'
+require 'nkf'
 $charset = 'EUC-JP'
 class HTMLout
 def contenttype(type = "text/html", charset = $charset)
 u.split('').each{|c|	# for security wrapping
 	newu << c[0].chr if %r,[-A-Z0-9/+_.@],i =~ c
 }
 u = newu
 map[u] = {}
-d = File.join(@usermapdir, u)
+d = File.join(@usermapdir, u).untaint
 next unless test(?d, d)
 Dir.foreach(d){|attr|
 	next if /^\./ =~ attr
 	attr.untaint if /^[A-Z_][-A-Z_0-9]*$/i =~ attr
-	file = File.join(@usermapdir, u, attr)
+	file = File.join(@usermapdir, u, attr).untaint
 	next unless test(?s, file) && test(?r, file)
-	map[u][attr] = IO.readlines(file).join().strip
+	map[u][attr] = IO.readlines(file).join.toeuc.strip
 }
 }
 map
 end
 def putuserattr(user, attr, text)
 #g.untaint ## untaintじゃだめだ。map{g} のkeyがtaintedになっちゃうよ
 gg = ''			# for security wrapping
 g.split('').each{|c| gg << c[0].chr if c != '`'}
 g = gg
 map[gg] = {}
-d = File.join(@groupmapdir, g)
+d = File.join(@groupmapdir, g).untaint
 next unless test(?d, d)
 # get group name
-gnf = File.join(d, 'name')
+gnf = File.join(d, 'name').untaint
 if test(?r, gnf) && test(?s, gnf)
-	n = IO.readlines(gnf)[0].to_s.strip
+	n = IO.readlines(gnf)[0].to_s.toeuc.strip
 	map[g]['name'] = if n > '' then n else g end
 else
 	map[g]['name'] = g
 end
 # get administrators
 #
-gad = File.join(d, 'admin')
+gad = File.join(d, 'admin').untaint
 map[g]['admin'] = []
 if test(?d, gad)
 	Dir.foreach(gad){|a|
 	  # administrator should be a person (not group)
 	  next unless /@/ =~ a
 	  map[g]['admin'] << a
 	}
 end
 # collect members
 #map[g]['members'] = collectmembers(g)
-memd = File.join(d, 'members')
+memd = File.join(d, 'members').untaint
 map[g]['members'] = []
 if test(?d, memd)
 	Dir.foreach(memd){|a|
 	  next if /^\./ =~ a
 	  map[g]['members'] << a
 def addgroup(group, users, remove=nil, role='members')
 grp = groups.grep(group)[0]	# group may be tainted, using kept name
 return nil unless grp
 for u in users
 next unless account_exists(u)
-mdir = File.join(@groupmapdir, grp, role)
+mdir = File.join(@groupmapdir, grp, role).untaint
-file = File.join(mdir, u)
+file = File.join(mdir, u).untaint
 if remove
 	@groupmap[grp][role].delete(u)
 	File.unlink(file) if test(?e, file)
 else
 	@groupmap[grp][role] << u
 end
 grp
 end
 def setgroupname(grp, name)
 return nil unless @groupmap[grp]
-mdir = File.join(@groupmapdir, grp)
+mdir = File.join(@groupmapdir, grp).untaint
-nfile = File.join(mdir, 'name')
+nfile = File.join(mdir, 'name').untaint
 @groupmap[grp]['name'] = name
 if grp == name
 # remove the name file because it is default name
 File.unlink(nfile) if test(?e, nfile)
 else
 	if ismember(user, who) || visible
 	  sched[time][who] = {}
 	  file = File.join(dir, @schedulefile)
 	  if test(?s, file) && test(?r, file) && test(?s, file)
-	    sched[time][who]['sched'] = IO.readlines(file).join().chomp!
+	    sched[time][who]['sched'] = IO.readlines(file).join.toeuc.chomp!
 	    sched[time][who]['regtime'] = File.stat(file).mtime
 	  end
 	  sched[time][who]['pub'] = visible
 	end
 } #|who|
 return ret
 end
 def getschedule(user, year, month, day, time)
 file = schedulefile(user, year, month, day, time)
 if test(?r, file) && test(?s, file)
-return IO.readlines(file).join
+return IO.readlines(file).join.toeuc
 end
 return nil
 end
 def remove(user, year, month, day, time)
 file = schedulefile(user, year, month, day, time)
 	  date.untaint
 	  f = File.join(ud, date)
 	  if test(?s, f)
 	    ntl[user][date] = {}
 	    ntl[user][date]['file'] = f
-	    ntl[user][date]['text'] = IO.readlines(f)
+	    ntl[user][date]['text'] = IO.readlines(f).toeuc
 	  else
 	    File.unlink(f)	# symlink points to nonexistent file
 	  end
 	}
 	if ntl[user].empty?
 end
 def setupHoliday(file = "holiday")
 @@holiday = {}
 return unless test(?f, file) && test(?s, file)
 IO.foreach(file){|line|
-line.strip
+line = line.toeuc.strip
 next if /^#/ =~ line
 date, what = line.scan(/(\S+)\s+(.*)/)[0]
 if %r,(\d+)/(\d+)/(\d+), =~ date
 	cdate = sprintf("%d/%d/%d", $1.to_i, $2.to_i, $3.to_i)
 	@@holiday[cdate] || @@holiday[cdate] = []
 	  'visible from other members?'],
 	'public'	=> ['公', 'pub'],
 	'nonpublic'	=> ['非', 'sec'],
 	'through'	=> ['～', '=&gt;'],
 	'yes'		=> ['はいな', 'yes'],
-	'no'		=> ['やだ', 'nope'],
+	'no'		=> ['やだ(非公開)', 'nope'],
 	'wnames'	=> [%w[日 月 火 水 木 金 土],
 	  %w[sun mon tue wed thu fri sat]],
 	'whichday'	=> ['<small>(まとめ登録の場合)</small><br>期間中のどの日に?',
 	  '<small>(On multiple registration)</small><br>Which days in the term?'],
 	'singleday'	=> ['一日分だけ登録', '1day regist'],
 	  'If you have no idea for getting this message, '+
 	  'it is mischief by someone else'],
 	'user'		=> ['ユーザ', 'user'],
 	'group'		=> ['グループ', 'group'],
 	'personal'	=> ['個人で', 'personal'],
-	'registas'	=> ['グループ予定として登録', 'Register as group'],
+	'registas'	=> ['グループ予定として登録?', 'Register as group?'],
+'headsched'	=> ['下の枠内に予定を記入: 1行以内で短めに。
+長くなるときは2行目以降に詳細を。',
+'Put shortest sentence as possible within 1 line.
+Or, put short subject in the first line, details in latter lines.'],
 	'joinquit'	=> ['入退', 'joining/quiting'],
 	'of'		=> ['の', "'s"],
 	'id'		=> ['ID(ローマ字1単語空白なしで)', 'ID(without spaces)'],
 	'name'		=> ['名前', 'name'],
 	'anystring'	=> ['(日本語OK)', '(any length, any characters)'],
 def decode!(string)
 string.gsub!(/\+/, ' ')
 string.gsub!(/%(..)/){[$1.hex].pack("c")}
 end
 def decode(string)
-string.gsub(/\+/, ' ')
+string.gsub(/\+/, ' ').gsub(/%(..)/){[$1.hex].pack("c")}
-string.gsub(/%(..)/){[$1.hex].pack("c")}
 end
 def gencookie(name, a, expire)
 x = a.collect{|k, v|
 sprintf("%s=%s", k, encode(v)) if v
 	cpy << c[0].chr if c[0] != ?`  # `
 }
 cpy
 else
 string
-end
+end.untaint
 end
 def checkmail(mail)
 account, domain = mail.scan(/(.*)@(.*)/)[0]
 return false unless account != nil && domain != nil
-return false unless /^[-0-9a-z_.]+$/oi =~ domain
+return false unless /^[-0-9a-z_.]+$/oi =~ domain.toeuc
 domain = safecopy(domain)
 require 'socket'
 begin
 TCPSocket.gethostbyname(domain)
 return true
 end
 end
 end
 def sendMail(to, subject, body)
-body = Kconv::tojis(body)
+body = NKF.nkf("-j", body)
-subject = Kconv.tojis(subject)
+subject = NKF.nkf("-jM", subject)
 to = safecopy(to)		# cleanup tainted address
-if /\e/ =~ subject		# If contains JIS chars...
-subject = subject.split(//,1).pack('m')
-subject = "=?iso-2022-jp?B?#{subject}?="
-end
 subject.gsub!(/\n/, '')
 begin
 if (m=open("|-", "w"))
 	m.print "To: #{to}\n"
 	m.print "Subject: #{subject}\n"
 # show specified month's calendar
 def showtable(day)
 if !checkauth
 return nil
 end
 month = day.month.to_s
 first = Time.mktime(day.year, day.month, 1)
 last  = daysofmonth(day.year, day.month)
 wday1 = first.wday
 start = 1-wday1
 	}
 end.to_s + "\n" + \
 @H.radio('editmode', 'remove', 'Delete?') + " / " + \
 @H.radio('editmode', 'modify', 'Overwrite?') + " / " + \
 @H.radio('editmode', 'append', 'Append?', true) + "<br>\n" + \
-@H.element("textarea", @schedulearea){} + "<br>\n" + \
+@H.element("p"){msg('headsched') + \
+@H.element("textarea", @schedulearea){}} + 	# textarea
 @H.submit_reset("GO")
 } #form
 end
 #
 # show the schedule list of specified date
 	if time < now
 	  outputError(msg('past'))
 	  return nil
 	end
 	begin
-	  (text = @params['schedule'].strip.gsub(/\r+\n/, $/)) << "\n"
+	  (text = decode(@params['schedule']).strip.gsub(/\r+\n/, $/)) << "\n"
 	  text = purify(text)
 	  replace = (/modify/i =~ @params['editmode'])
 	  rc = @sc.register(registerer, y, m, d, timedir, text, replace)
 	  if @params['pub'] && /yes/ =~ @params['pub']
 	    @sc.putfile(registerer, y, m, d, timedir, 'pub', "1\n")
 	  end
 	  ########  @O.print @H.p(msg('appended')) if rc == 1
 	rescue
 	  outputError("Failed"+$!)
 	end
-	text = decode(@sc.getschedule(registerer, y, m, d, timedir))
+	text = @sc.getschedule(registerer, y, m, d, timedir)
 	reg_notify(registerer, y, m, d, timedir, text)
 end
 end
 end
 cookie
 end
 end
-$KCODE='e'
+$KCODE='e' if RUBY_VERSION < "1.9"
 After5.new.doit
 if __FILE__ == $0
 end

Mercurial > hgrepos > hgweb.cgi > after5

comparison after5.rb @ 17:904bbce89e71 draft