# HG changeset patch # User HIROSE Yuuji # Date 1340284164 -32400 # Node ID 9a82edb295ca907a589f8e8298109bdb9e30246f # Parent bcb4a41a43b517cd8067871c84a6d4a01f83809f Adjust umask. Max width of email entry, enlarged. diff -r bcb4a41a43b5 -r 9a82edb295ca after5.rb --- a/after5.rb Thu Jun 21 22:08:22 2012 +0900 +++ b/after5.rb Thu Jun 21 22:09:24 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 Mon Jun 18 11:03:46 2012 on firestorm +# Last modified Thu Jun 21 21:42:34 2012 on firestorm # See http://www.gentei.org/~yuuji/software/after5/ # このスクリプトはEUCで保存してください。 $hgid = <<_HGID_.split[1..-2].join(" ") @@ -279,7 +279,7 @@ def mkusermap() map = {} unless test(?d, @usermapdir) - mkdir_p(@usermapdir) + mkdir_p(@usermapdir, 0750) end Dir.foreach(@usermapdir){|u| next if /^\./ =~ u @@ -1670,11 +1670,12 @@ # exec(@attr['mail'], "-s", subject, to) recipient = rcptto || to.split(/,\s*|\s+/) #p recipient + File.umask(077) if spoolto && spoolto.is_a?(String) && proc { require 'fileutils' begin - test(?d, spoolto) or FileUtils.mkdir_p(spoolto) + test(?d, spoolto) or FileUtils.mkdir_p(spoolto, 0700) test(?w, spoolto) rescue nil @@ -1766,7 +1767,10 @@ "This " + \ @H.a(@after5url, "After5") + \ " board is maintained by " + \ - @opt['maintainer'].sub('@', "@") + "." + @opt['maintainer'].gsub(".", "."). + sub('@', "@") + \ + '.cut.here' + \ + "." } end def footer() @@ -2861,7 +2865,7 @@ @H.elementln("tr"){ @H.element("td", tdclass) {msg('mailaddress', 'multipleok')} + \ @H.element("td") { - @H.text("newmail", mailaddress(user), @opt['size'], 80) + @H.text("newmail", mailaddress(user), @opt['size'], 180) } } + \ @H.elementln("tr"){ @@ -2998,7 +3002,7 @@ @O.print @H.p(msg('usermodwarn')) @O.print \ @H.elementln("form", {'action'=>@myname+"?-groupmod", 'method'=>'POST'}){ - @H.elementln("table", {'border'=>'1', 'vertical-align'=>'top'}){ + @H.elementln("table", {'class'=>'border'}){ grmap.sort.collect{|g, ghash| memberp = @sc.ismember(user, g) @H.elementln("tr"){ @@ -3032,7 +3036,7 @@ end memlist.collect{|u| @sc.nickname(u) + \ - ((u == user) ? ("("+@H.text("mail4-#{g}", memberp, 30, 80)+")") : "") + ((u == user) ? ("("+@H.text("mail4-#{g}", memberp, 30, 180)+")") : "") }.join(", ") } } + \ @@ -3158,6 +3162,7 @@ userlist = ([user] + users()).uniq.sort myselfclass = {'class'=>'admin'} + yesclass = {'class' => 'yes'} colspan2 = {'colspan'=>'2'} colspan3 = {'colspan'=>'3'} warnclass = {'class'=>'warn'} @@ -3204,13 +3209,14 @@ memberp = adminp = (u == user) end @H.elementln("tr", (u==user ? myselfclass : nil)){ - @H.element("td"){ - @H.radio('mem-'+u, 'yes', 'YES / ', memberp) + \ - @H.radio('mem-'+u, 'no', 'NO', !memberp) + @H.element("td", memberp && yesclass){ + yes = memberp ? 'YES' : 'yes' + @H.radio('mem-'+u, 'yes', yes+' / ', memberp) + \ + @H.radio('mem-'+u, 'no', 'no', !memberp) } + \ @H.element("td"){ @H.radio('adm-'+u, 'yes', 'Admin / ', adminp) + \ - @H.radio('adm-'+u, 'no', 'NO', !adminp) + @H.radio('adm-'+u, 'no', 'no', !adminp) } + \ @H.element("td"){ @H.element("abbr", "title"=>mailaddress(u)) {