Mercurial > hgrepos > hgweb.cgi > after5

changeset 15:580c1b0fa27e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RCS-revision 1.16 date: 2008/03/16 06:24:44; author: yuuji; state: Exp; lines: +11 -9 Fix for url-decoding.
author HIROSE Yuuji <yuuji@gentei.org>
date Sun, 16 Mar 2008 06:24:44 +0859
parents 9aa45b698d56
children 1ff30d4c58ce
files after5.rb
diffstat 1 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/after5.rb	Sat Apr 28 01:21:33 2007 +0859
+++ b/after5.rb	Sun Mar 16 06:24:44 2008 +0859
@@ -1,9 +1,9 @@
 #!/usr/local/bin/ruby
 #
 # Associative Scheduling Table - after5
-# (C)2003, 2004, 2006 by HIROSE Yuuji [yuuji@gentei.org]
-# $Id: after5.rb,v 1.15 2007/04/28 01:21:33 yuuji Exp $
-# Last modified Sat Apr 28 10:19:45 2007 on firestorm
+# (C)2003, 2004, 2006, 2008 by HIROSE Yuuji [yuuji@gentei.org]
+# $Id: after5.rb,v 1.16 2008/03/16 06:24:44 yuuji Exp $
+# Last modified Sun Mar 16 15:22:32 2008 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 
@@ -935,7 +935,7 @@
       @pe[0].close
       @pe[1].close
 
-      exec *cmd
+      exec(*cmd)
       exit 0
     end
     return [@pw[1], @pr[0], @pe[0]]
@@ -1087,7 +1087,7 @@
     end
     @params['user'] = safecopy(@params['user'])
 
-    eval @job
+    ######eval @job
     a5name = if @opt['name'] && @opt['name'] > ''
 	       sprintf("(%s)", @opt['name'])
 	     else
@@ -1095,8 +1095,9 @@
 	     end
     @O.append(@H.contenttype() +
 	      @H.head(a5name+"After 5"+@job.sub(/\s*/, ' '), @opt['css']))
-    # @job is here
     @O.print @H.startelement("body", bodyclass, true)
+    # @job should be here because its output shoud go after <body>.
+    eval @job
     @O.print @H.endelement(nil, true) # body
     @O.print @H.endelement("html", true)	# html
     setcookie()
@@ -1828,7 +1829,7 @@
 		    @opt['tdskip']
 		  end
 		} + \
-		@H.element("td"){s[time][who]['sched']}
+		@H.element("td"){decode(s[time][who]['sched'])}
 	      }
 	    }.join("\n")
 	  }
@@ -2237,7 +2238,7 @@
 	rescue
 	  outputError("Failed"+$!)
 	end
-	text = @sc.getschedule(registerer, y, m, d, timedir)
+	text = decode(@sc.getschedule(registerer, y, m, d, timedir))
 	reg_notify(registerer, y, m, d, timedir, text)
 
       end
@@ -2306,6 +2307,7 @@
       outputError "%s %s", datetime, msg('noplan')
       return nil
     end
+    text = decode(text)
     @O.print @H.elementln("h1"){
       sprintf "%s %s", datetime, msg(editmode)
     }
@@ -2428,7 +2430,7 @@
 	dellist << filehash['file']
 	sprintf("%s[[[%d/%d/%d %s]]]%s\n", line, y, m, d, hhmm, line) + \
 	sprintf("(%s %s)\n", comment, msg('notification')) + \
-	indent+filehash['text'].join(indent) + "\n\n"
+	indent+decode(filehash['text'].join(indent)) + "\n\n"
       }
       # content.delete(nil)
       if content

yatex.org