svnno****@sourc*****
svnno****@sourc*****
2009年 9月 10日 (木) 23:02:21 JST
Revision: 1061
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1061
Author: okkez
Date: 2009-09-10 23:02:21 +0900 (Thu, 10 Sep 2009)
Log Message:
-----------
use @request instead of @cgi
Modified Paths:
--------------
hiki/branches/rack/hiki/command.rb
Modified: hiki/branches/rack/hiki/command.rb
===================================================================
--- hiki/branches/rack/hiki/command.rb 2009-09-10 14:02:17 UTC (rev 1060)
+++ hiki/branches/rack/hiki/command.rb 2009-09-10 14:02:21 UTC (rev 1061)
@@ -22,16 +22,17 @@
class Command
include Hiki::Util
# TODO cgi -> request
- def initialize(cgi, db, conf)
- @db = db
- @params = cgi.params
- @cgi = cgi
- @conf = conf
- @cookies = cgi.cookies
+ def initialize(request, db, conf)
+ @db = db
+ @request = request
+ @cgi = @request # for backward compatibility
+ @params =****@reque*****
+ @cookies =****@reque*****
+ @conf = conf
code_conv
# for TrackBack
- if %r|/tb/(.+)$| =~ @cgi.env['REQUEST_URI']
+ if %r|/tb/(.+)$| =~ @request.env['REQUEST_URI']
@params['p'] = unescape($1)
@params['c'] = 'plugin'
@params['plugin'] = 'trackback_post'
@@ -52,7 +53,7 @@
end
if /\A\.{1,2}\z/ =~ @p
- redirect(@cgi, @conf.index_url)
+ redirect(@request, @conf.index_url)
return
end
@@ -60,12 +61,13 @@
@p =****@alias*****_name(@p).to_euc if @p
options =****@conf***** || Hash.new( '' )
- options['page'] = @p
- options['db'] = @db
- options['cgi'] = cgi
- options['alias'] = @aliaswiki
+ options['page'] = @p
+ options['db'] = @db
+ options['request'] = @request
+ options['cgi'] = @request # for backward compatibility
+ options['alias'] = @aliaswiki
options['command'] = @cmd ? @cmd : 'view'
- options['params'] = @params
+ options['params'] = @params
@plugin = Plugin.new( options, @conf )
session_id = @cookies['session_id']
@@ -84,13 +86,13 @@
end
@body_enter =****@plugi*****_enter_proc
- Filter.init(@conf, @cgi, @plugin, @db)
+ Filter.init(@conf, @request, @plugin, @db)
end
def dispatch
begin
Timeout.timeout(@conf.timeout) {
- if****@cgi*****?
+ if****@reque*****?
raise PermissionError, 'Permission denied' unles****@plugi*****?
end
@cmd = 'view' unless @cmd
@@ -145,7 +147,7 @@
data[:body].gsub!( Regexp.new( Regexp.quote( Plugin::TOC_STRING ) ), data[:toc] )
end
- @page = Hiki::Page.new( @cgi, @conf )
+ @page = Hiki::Page.new( @request, @conf )
@page.template =****@conf*****_template( @cmd )
@page.contents = data
@@ -161,7 +163,7 @@
data[:view_title] = 'Error'
data[:header] =****@plugi*****_proc
data[:frontpage] =****@plugi*****_name( 'FrontPage' )
- @page = Hiki::Page.new( @cgi, @conf )
+ @page = Hiki::Page.new( @request, @conf )
@page.template =****@conf*****_template( 'error' )
@page.contents = data
@page.process( @plugin )
@@ -407,7 +409,7 @@
end
@db.freeze_page( page, @params['freeze'] ? true : false) if****@plugi*****?
- return redirect(@cgi, @conf.base_url +****@plugi*****_url(page))
+ return redirect(@request, @conf.base_url +****@plugi*****_url(page))
end
end
@@ -499,7 +501,7 @@
url =****@conf*****_url
end
cookies = [session_cookie(session.session_id)]
- return redirect(@cgi, url, cookies)
+ return redirect(@request, url, cookies)
else
msg_login_result =****@conf*****_login_failure
status = '403 Forbidden'
@@ -565,7 +567,7 @@
end
if redirect_mode and result
- redirect(@cgi, @conf.base_url +****@plugi*****_url(@p))
+ redirect(@request, @conf.base_url +****@plugi*****_url(@p))
end
end
@@ -574,7 +576,7 @@
cookies = [session_cookie(session_id, -1)]
Hiki::Session.new( @conf, session_id ).delete
end
- redirect(@cgi, @conf.index_url, cookies)
+ redirect(@request, @conf.index_url, cookies)
end
def cookie(name, value, max_age = Session::MAX_AGE)