svnno****@sourc*****
svnno****@sourc*****
2009年 8月 30日 (日) 23:47:05 JST
Revision: 1034
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1034
Author: okkez
Date: 2009-08-30 23:47:05 +0900 (Sun, 30 Aug 2009)
Log Message:
-----------
fix auth_typekey plugin
Modified Paths:
--------------
hiki/branches/rack/misc/plugin/auth_typekey.rb
Modified: hiki/branches/rack/misc/plugin/auth_typekey.rb
===================================================================
--- hiki/branches/rack/misc/plugin/auth_typekey.rb 2009-08-30 14:47:02 UTC (rev 1033)
+++ hiki/branches/rack/misc/plugin/auth_typekey.rb 2009-08-30 14:47:05 UTC (rev 1034)
@@ -10,21 +10,21 @@
def auth?
return true if @conf['typekey.token'].empty?
- session_id =****@cgi*****['typekey_session_id'][0]
- session_id && Session::new(@conf, session_id).check
+ session_id =****@cgi*****['typekey_session_id']
+ session_id && Session.new(@conf, session_id).check
end
def auth_typekey
tk = TypeKey.new(@conf['typekey.token'], '1.1')
- ts = @cgi.params['ts'][0]
- email =****@cgi*****['email'][0]
- name = @cgi.params['name'][0]
- nick = @cgi.params['nick'][0]
- sig = @cgi.params['sig'][0]
- page = @cgi.params['p'][0] || 'FrontPage'
+ ts = @params['ts']
+ email = @params['email']
+ name = @params['name']
+ nick = @params['nick']
+ sig = @params['sig']
+ page = @params['p'] || 'FrontPage'
if ts and email and name and nick and sig and tk.verify(email, name, nick, ts, sig)
- session = Session::new(@conf)
+ session = Session.new(@conf)
session.user = utf8_to_euc(nick)
session.save
self.cookies << typekey_cookie('typekey_session_id', session.session_id)
@@ -41,14 +41,14 @@
end
def typekey_cookie(name, value, max_age = Session::MAX_AGE)
- CGI::Cookie::new( {
+ Hiki::Cookie.new( {
'name' => name,
'value' => value,
'path' => self.cookie_path,
})
end
-add_body_enter_proc(Proc::new do
+add_body_enter_proc(Proc.new do
if !auth?
label_auth_typekey_login
elsif @user
@@ -62,7 +62,7 @@
def saveconf_auth_typekey
if @mode == 'saveconf' then
- @conf['typekey.token'] =****@cgi*****['typekey.token'][0]
+ @conf['typekey.token'] = @params['typekey.token']
end
end