svnno****@sourc*****
svnno****@sourc*****
2009年 8月 30日 (日) 23:03:53 JST
Revision: 1018
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1018
Author: okkez
Date: 2009-08-30 23:03:53 +0900 (Sun, 30 Aug 2009)
Log Message:
-----------
merge from trunk r1015:1016
use Hiki::Util's utility methods instead of CGI's utility methods
* hiki/command.rb: use Hiki::Util#escape, Hiki::Util#unescape,
Hiki::Util#escape_html and Hiki::Util#unescape_html instead of
CGI.escape, CGI.unescape, CGI.escapeHTML and CGI.unescapeHTML.
* hiki/db/flatfile.rb: ditto.
* hiki/filter/bayes_filter.rb: ditto.
* hiki/interwiki.rb: ditto.
* hiki/repos/cvs.rb: ditto.
* hiki/repos/default.rb: ditto.
* hiki/repos/git.rb: ditto.
* hiki/repos/hg.rb: ditto.
* hiki/repos/plain.rb: ditto.
* hiki/repos/svn.rb: ditto.
* hiki/storage.rb: ditto.
* hiki/util.rb: ditto.
* misc/plugin/append-css.rb: ditto.
* misc/plugin/attach.rb: ditto.
* misc/plugin/attach/attach.cgi: ditto.
* misc/plugin/auth_typekey.rb: ditto.
* misc/plugin/bbs.rb: ditto.
* misc/plugin/category.rb: ditto.
* misc/plugin/comment.rb: ditto.
* misc/plugin/diffmail.rb: ditto.
* misc/plugin/edit_user.rb: ditto.
* misc/plugin/footnote.rb: ditto.
* misc/plugin/google-sitemaps.rb: ditto.
* misc/plugin/highlight.rb: ditto.
* misc/plugin/history.rb: ditto.
* misc/plugin/incremental_search.rb: ditto.
* misc/plugin/isbn.rb: ditto.
* misc/plugin/its.rb: ditto.
* misc/plugin/keyword.rb: ditto.
* misc/plugin/math.rb: ditto.
* misc/plugin/note.rb: ditto.
* misc/plugin/orphan.rb: ditto.
* misc/plugin/pagerank.rb: ditto.
* misc/plugin/rank.rb: ditto.
* misc/plugin/readlirs.rb: ditto.
* misc/plugin/recent2.rb: ditto.
* misc/plugin/referer.rb: ditto.
* misc/plugin/rss-show.rb: ditto.
* misc/plugin/rss.rb: ditto.
* misc/plugin/sitemap.rb: ditto.
* misc/plugin/src.rb: ditto.
* misc/plugin/template.rb: ditto.
* misc/plugin/todo.rb: ditto.
* misc/plugin/trackback.rb: ditto.
* plugin/00default.rb: ditto.
* plugin/01sp.rb: ditto.
* plugin/50bayes_filter.rb: ditto.
* plugin/de/00default.rb: ditto.
* plugin/en/00default.rb: ditto.
* plugin/fr/00default.rb: ditto.
* plugin/it/00default.rb: ditto.
* plugin/ja/00default.rb: ditto.
* style/default/html_formatter.rb: ditto.
* style/math/html_formatter.rb: ditto.
* style/math/latex.rb: ditto.
* style/rd+/anchorlist.rb: ditto.
* style/rd+/html_formatter.rb: ditto.
* style/rd+/rd2html.rb: ditto.
Modified Paths:
--------------
hiki/branches/rack/hiki/command.rb
Modified: hiki/branches/rack/hiki/command.rb
===================================================================
--- hiki/branches/rack/hiki/command.rb 2009-08-30 14:03:31 UTC (rev 1017)
+++ hiki/branches/rack/hiki/command.rb 2009-08-30 14:03:53 UTC (rev 1018)
@@ -33,7 +33,7 @@
# for TrackBack
if %r|/tb/(.+)$| =~ @cgi.env['REQUEST_URI']
- @params['p'] = CGI.unescape($1)
+ @params['p'] = unescape($1)
@params['c'] = 'plugin'
@params['plugin'] = 'trackback_post'
end
@@ -194,7 +194,7 @@
if****@conf*****_keys
word = @params['key']
if word && word.size > 0
- contents = hilighten(contents, word.unescape.split)
+ contents = hilighten(contents, unescape(word).split)
end
end
@@ -207,12 +207,12 @@
pg_title =****@plugi*****_name(@p)
- data[:page_title] =****@plugi*****_anchor(@p.escape, h(@p))
+ data[:page_title] =****@plugi*****_anchor(escape(@p), h(@p))
data[:view_title] = pg_title
- data[:title] = title( pg_title.unescapeHTML )
+ data[:title] = title(unescape_html(pg_title))
data[:toc] =****@plugi*****_f ? toc : nil
data[:body] = formatter.apply_tdiary_theme(contents)
- data[:references] = ref.collect! {|a| "[#{@plugin.hiki_anchor(a.escape, @plugin.page_name(a))}] " }.join
+ data[:references] = ref.collect! {|a| "[#{@plugin.hiki_anchor(escape(a), @plugin.page_name(a))}] " }.join
data[:keyword] =****@db*****_attribute(@p, :keyword).collect {|k| "[#{view_title(k)}]"}.join(' ')
data[:last_modified] =****@db*****_last_update( @p )
@@ -248,7 +248,7 @@
editor = f[k][:editor] ? "by #{f[k][:editor]}" : ''
display_text = h((f[k][:title] and f[k][:title].size > 0) ? f[k][:title] : k)
display_text << " [#{@aliaswiki.aliaswiki(k)}]" if k !=****@alias*****(k)
- %Q!#{@plugin.hiki_anchor(k.escape, display_text)}: #{format_date(f[k][:last_modified] )} #{editor}#{@conf.msg_freeze_mark if f[k][:freeze]}!
+ %Q!#{@plugin.hiki_anchor(escape(k), display_text)}: #{format_date(f[k][:last_modified] )} #{editor}#{@conf.msg_freeze_mark if f[k][:freeze]}!
}
data = get_common_data( @db, @plugin, @conf )
@@ -286,7 +286,7 @@
display_text = (f[k][:title] and f[k][:title].size > 0) ? f[k][:title] : k
display_text = h(display_text)
display_text << " [#{@aliaswiki.aliaswiki(k)}]" if k !=****@alias*****(k)
- %Q|#{format_date( tm )}: #{@plugin.hiki_anchor( k.escape, display_text )} #{h(editor)} (<a href="#{@conf.cgi_name}#{cmdstr('diff',"p=#{k.escape}")}">#{@conf.msg_diff}</a>)|
+ %Q|#{format_date( tm )}: #{@plugin.hiki_anchor(escape(k), display_text)} #{h(editor)} (<a href="#{@conf.cgi_name}#{cmdstr('diff',"p=#{escape(k)}")}">#{@conf.msg_diff}</a>)|
}
[list, last_modified]
end
@@ -318,7 +318,7 @@
old = text.gsub(/\r/, '')
new =****@db*****( page ) || ''
differ = word_diff( old, new ).gsub( /\n/, "<br>\n" )
- link =****@plugi*****_anchor( page.escape, h(page))
+ link =****@plugi*****_anchor(escape(page), h(page))
end
@cmd = 'edit'
@@ -418,9 +418,9 @@
if word && word.size > 0
total, l =****@db*****(word)
if****@conf*****_keys
- l.collect! {|p| @plugin.make_anchor("#{@conf.cgi_name}?cmd=view&p=#{p[0].escape}&key=#{word.split.join('+').escape}", @plugin.page_name(p[0])) + " - #{p[1]}"}
+ l.collect! {|p| @plugin.make_anchor("#{@conf.cgi_name}?cmd=view&p=#{escape(p[0])}&key=#{escape(word.split.join('+'))}", @plugin.page_name(p[0])) + " - #{p[1]}"}
else
- l.collect! {|p| @plugin.hiki_anchor( p[0].escape, @plugin.page_name(p[0])) + " - #{p[1]}"}
+ l.collect! {|p| @plugin.hiki_anchor(escape(p[0]]), @plugin.page_name(p[0])) + " - #{p[1]}"}
end
data = get_common_data( @db, @plugin, @conf )
data[:title] = title( @conf.msg_search_result )
@@ -542,7 +542,7 @@
return tmp
end
- p = (@db.select {|p| p[:title] and p[:title].unescape == page})[0]
+ p = (@db.select {|p| p[:title] and unescape(p[:title]) == page})[0]
if p != @p and p != nil
return p
end