svnno****@sourc*****
svnno****@sourc*****
2009年 9月 10日 (木) 23:03:26 JST
Revision: 1086
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1086
Author: okkez
Date: 2009-09-10 23:03:26 +0900 (Thu, 10 Sep 2009)
Log Message:
-----------
use****@reque***** instead of @params
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:03:24 UTC (rev 1085)
+++ hiki/branches/rack/hiki/command.rb 2009-09-10 14:03:26 UTC (rev 1086)
@@ -33,22 +33,22 @@
# for TrackBack
if %r|/tb/(.+)$| =~ @request.env['REQUEST_URI']
- @params['p'] = unescape($1)
- @params['c'] = 'plugin'
- @params['plugin'] = 'trackback_post'
+ @request.params['p'] = unescape($1)
+ @request.params['c'] = 'plugin'
+ @request.params['plugin'] = 'trackback_post'
end
- @cmd = @params['c']
- @p = case****@param*****
+ @cmd =****@reque*****['c']
+ @p = case****@reque*****
when 0
'FrontPage'
when 1
- @cmd ? nil : @params.keys.first
+ @cmd ? nil : @request.params.keys.first
else
if @cmd == "create"
- @params['key'] ? @params['key'] : nil
+ @request.params['key'] ? @request.params['key'] : nil
else
- @params['p'] ? @params['p'] : nil
+ @request.params['p'] ? @request.params['p'] : nil
end
end
@@ -102,9 +102,9 @@
cmd_edit( @p )
elsif @cmd == 'save'
raise PermissionError, 'Permission denied' unles****@plugi*****?
- if @params['save']
- cmd_save(@p, @params['contents'], @params['md5hex'], @params['update_timestamp'])
- elsif @params['edit_form_button']
+ if****@reque*****['save']
+ cmd_save(@p, @request.params['contents'], @request.params['md5hex'], @request.params['update_timestamp'])
+ elsif****@reque*****['edit_form_button']
@cmd = 'edit'
cmd_plugin(false)
cmd_edit( @p, @plugin.text )
@@ -171,9 +171,9 @@
end
def cmd_preview
- raise SessionError if****@plugi*****_id && @plugin.session_id != @params['session_id']
+ raise SessionError if****@plugi*****_id && @plugin.session_id !=****@reque*****['session_id']
@cmd = 'preview'
- cmd_edit( @p, @params['contents'], @conf.msg_preview, @params['page_title'] )
+ cmd_edit( @p, @request.params['contents'], @conf.msg_preview, @request.params['page_title'] )
end
def cmd_view
@@ -192,7 +192,7 @@
formatter =****@conf*****( tokens, @db, @plugin, @conf )
contents, toc = formatter.to_s, formatter.toc
if****@conf*****_keys
- word = @params['key']
+ word =****@reque*****['key']
if word && word.size > 0
contents = hilighten(contents, unescape(word).split)
end
@@ -311,9 +311,9 @@
formatter =****@conf*****( p, @db, @plugin, @conf )
preview_text, toc = formatter.to_s, formatter.toc
save_button = ''
- data[:keyword] = h(@params['keyword'] || '')
- data[:update_timestamp] = @params['update_timestamp'] ? ' checked' : ''
- data[:freeze] = @params['freeze'] ? ' checked' : ''
+ data[:keyword] = h(@request.params['keyword'] || '')
+ data[:update_timestamp] =****@reque*****['update_timestamp'] ? ' checked' : ''
+ data[:freeze] =****@reque*****['freeze'] ? ' checked' : ''
elsif @cmd == 'conflict'
old = text.gsub(/\r/, '')
new =****@db*****( page ) || ''
@@ -323,13 +323,13 @@
@cmd = 'edit'
- if rev = @params['r']
+ if rev =****@reque*****['r']
text =****@conf*****_revision(page, rev.to_i)
raise 'No such revision.' if text.empty?
else
text = ( @db.load( page ) || '' ) unless text
end
- md5hex = @params['md5hex'] || @db.md5hex( page )
+ md5hex =****@reque*****['md5hex'] || @db.md5hex( page )
@plugin.text = text
@@ -373,7 +373,7 @@
end
def cmd_save( page, text, md5hex, update_timestamp = true )
- raise SessionError if****@plugi*****_id && @plugin.session_id != @params['session_id']
+ raise SessionError if****@plugi*****_id && @plugin.session_id !=****@reque*****['session_id']
subject = ''
if text.empty?
@db.delete( page )
@@ -384,7 +384,7 @@
data[:link] = h(page)
generate_page(data)
else
- title = @params['page_title'] ? @params['page_title'].strip : page
+ title =****@reque*****['page_title'] ? @request.params['page_title'].strip : page
title = title.size > 0 ? title : page
if exist?(title)
@@ -398,7 +398,7 @@
end
if****@plugi*****( page, text, md5hex, update_timestamp, false )
- keyword = @params['keyword'].split("\n").collect {|k|
+ keyword =****@reque*****['keyword'].split("\n").collect {|k|
k.chomp.strip}.delete_if{|k| k.size == 0}
attr = [[:keyword, keyword.uniq], [:title, title]]
attr << [:editor, @plugin.user]
@@ -408,13 +408,13 @@
return cmd_edit( page, text, @conf.msg_save_conflict )
end
- @db.freeze_page( page, @params['freeze'] ? true : false) if****@plugi*****?
+ @db.freeze_page( page, @request.params['freeze'] ? true : false) if****@plugi*****?
return redirect(@request, @conf.base_url +****@plugi*****_url(page))
end
end
def cmd_search
- word = @params['key']
+ word =****@reque*****['key']
if word && word.size > 0
total, l =****@db*****(word)
if****@conf*****_keys
@@ -450,11 +450,11 @@
end
def cmd_create( msg = nil )
- p = @params['key']
+ p =****@reque*****['key']
if p
@p =****@alias*****_name(p).to_euc
if /^\./ =~ @p || @p.size > @conf.max_name_size || @p.size == 0
- @params['key'] = nil
+ @request.params['key'] = nil
cmd_create( @conf.msg_invalid_filename( @conf.max_name_size) )
return
end
@@ -466,7 +466,7 @@
s =****@db*****( @p )
cmd_edit( orig_page || @p, s, @conf.msg_already_exist )
else
- cmd_edit( @p, @params['text'] )
+ cmd_edit( @p, @request.params['text'] )
end
else
data = get_common_data( @db, @plugin, @conf )
@@ -483,9 +483,9 @@
end
def cmd_login
- name = @params['name']
- password = @params['password']
- page = @params['p']
+ name =****@reque*****['name']
+ password =****@reque*****['password']
+ page =****@reque*****['p']
msg_login_result = nil
status = 'OK'
if name && password
@@ -520,12 +520,12 @@
raise PermissionError, 'Permission denied' unles****@plugi*****?
data = get_common_data( @db, @plugin, @conf )
- data[:key] = h(@params['conf'] || 'default')
+ data[:key] = h(@request.params['conf'] || 'default')
data[:title] = title( @conf.msg_admin )
data[:session_id] =****@plugi*****_id
- if @params['saveconf']
- raise SessionError if****@plugi*****_id && @plugin.session_id != @params['session_id']
+ if****@reque*****['saveconf']
+ raise SessionError if****@plugi*****_id && @plugin.session_id !=****@reque*****['session_id']
data[:save_config] = true
end
generate_page( data )
@@ -556,7 +556,7 @@
def cmd_plugin(redirect_mode = true)
return unles****@conf*****_plugin
- plugin = @params['plugin']
+ plugin =****@reque*****['plugin']
result = true
if****@plugi*****_to?( plugin ) && !Object.method_defined?( plugin )
@@ -594,8 +594,8 @@
def code_conv
if****@conf*****_agent? && /EUC-JP/i =~ @conf.charset
- @params.each_key do |k|
- @params[k].each do |v|
+ @request.params.each_key do |k|
+ @request.params[k].each do |v|
v.replace(v.to_euc) if v
end
end