svnno****@sourc*****
svnno****@sourc*****
2009年 9月 10日 (木) 23:03:21 JST
Revision: 1084
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1084
Author: okkez
Date: 2009-09-10 23:03:20 +0900 (Thu, 10 Sep 2009)
Log Message:
-----------
do not require cgi.rb
Modified Paths:
--------------
hiki/branches/rack/hiki/auth/typekey.rb
Modified: hiki/branches/rack/hiki/auth/typekey.rb
===================================================================
--- hiki/branches/rack/hiki/auth/typekey.rb 2009-09-10 14:03:18 UTC (rev 1083)
+++ hiki/branches/rack/hiki/auth/typekey.rb 2009-09-10 14:03:20 UTC (rev 1084)
@@ -14,12 +14,12 @@
=begin
token="your_site_token"
tk = TypeKey.new(token,'1.1')
-if cgi.params['tk'][0] == "1"
- ts = cgi.params["ts"][0]
- email =cgi.params["email"][0]
- name =cgi.params["name"][0]
- nick =cgi.params["nick"][0]
- sig = cgi.params["sig"][0]
+if request.params['tk'] == "1"
+ ts = request.params["ts"]
+ email = request.params["email"]
+ name = request.params["name"]
+ nick = request.params["nick"]
+ sig = request.params["sig"]
if tk.verify(email, name, nick, ts, sig)
puts "verify!"
else
@@ -36,7 +36,7 @@
=end
require 'uri'
-require 'cgi'
+require 'cgi' unless Object.const_defined?(:Rack)
require 'open-uri'
require 'base64'
require 'openssl'
@@ -107,7 +107,7 @@
url += 'login?t=' + @token
url += email
url += '&v=' + @version
- url += '&_return=' + CGI.escape(return_url)
+ url += '&_return=' + Hiki::Util.escape(return_url)
return url
end