PyukiWiki CVS Commit
pyuki****@lists*****
2012年 8月 8日 (水) 14:19:29 JST
Index: PyukiWiki-Devel-UTF8/lib/setting.inc.pl diff -u PyukiWiki-Devel-UTF8/lib/setting.inc.pl:1.392 PyukiWiki-Devel-UTF8/lib/setting.inc.pl:1.393 --- PyukiWiki-Devel-UTF8/lib/setting.inc.pl:1.392 Tue Aug 7 04:42:11 2012 +++ PyukiWiki-Devel-UTF8/lib/setting.inc.pl Wed Aug 8 14:19:29 2012 @@ -1,6 +1,6 @@ ###################################################################### # setting.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: setting.inc.pl,v 1.392 2012/08/06 19:42:11 papu Exp $ +# $Id: setting.inc.pl,v 1.393 2012/08/08 05:19:29 papu Exp $ # # "PyukiWiki" ver 0.2.1-alpha2-dev3 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -83,15 +83,13 @@ } my $escapeoff=0; - if($::use_escapeoff > 0) { - if(defined($::setting_cookie{escapeoff})) { - $escapeoff=$::setting_cookie{escapeoff}+0; - } else { - $escapeoff=$::use_escapeoff+0; - } - &escapeoff if($escapeoff > 0); - $::escapeoff_exec = 1; + if(defined($::setting_cookie{escapeoff})) { + $escapeoff=$::setting_cookie{escapeoff}+0; + } else { + $escapeoff=$::use_escapeoff+0; } + &escapeoff($escapeoff) if($escapeoff > 0); + $::escapeoff_exec = 1; } 1; __DATA__ Index: PyukiWiki-Devel-UTF8/lib/wiki_func.cgi diff -u PyukiWiki-Devel-UTF8/lib/wiki_func.cgi:1.40 PyukiWiki-Devel-UTF8/lib/wiki_func.cgi:1.41 --- PyukiWiki-Devel-UTF8/lib/wiki_func.cgi:1.40 Tue Aug 7 04:42:11 2012 +++ PyukiWiki-Devel-UTF8/lib/wiki_func.cgi Wed Aug 8 14:19:29 2012 @@ -1,6 +1,6 @@ ###################################################################### # wiki_func.cgi - This is PyukiWiki, yet another Wiki clone. -# $Id: wiki_func.cgi,v 1.40 2012/08/06 19:42:11 papu Exp $ +# $Id: wiki_func.cgi,v 1.41 2012/08/08 05:19:29 papu Exp $ # # "PyukiWiki" ver 0.2.1-alpha2-dev3 $$ # Copyright (C) 2004-2007 Nekyo @@ -983,7 +983,7 @@ =item 入力 -&escapeoff; +&escapeoff(0 or 1 or 2) =item 出力 @@ -1004,10 +1004,17 @@ =cut sub escapeoff { + my ($flg)=shift; if($ENV{HTTP_USER_AGENT}=~/MSIE/ && $ENV{HTTP_USER_AGENT}!~/Opera/) { + if($flg eq 1) { $::IN_JSHEAD.=<<EOM -d.onkeydown=escpress; +d.onkeydown=eprs; EOM + } elsif($flg eq 2) { + $::IN_JSHEAD.=<<EOM +d.onkeydown=eprsc; +EOM + } } } Index: PyukiWiki-Devel-UTF8/lib/wiki_wiki.cgi diff -u PyukiWiki-Devel-UTF8/lib/wiki_wiki.cgi:1.37 PyukiWiki-Devel-UTF8/lib/wiki_wiki.cgi:1.38 --- PyukiWiki-Devel-UTF8/lib/wiki_wiki.cgi:1.37 Tue Aug 7 04:42:11 2012 +++ PyukiWiki-Devel-UTF8/lib/wiki_wiki.cgi Wed Aug 8 14:19:29 2012 @@ -1,6 +1,6 @@ ###################################################################### # wiki_wiki.cgi - This is PyukiWiki, yet another Wiki clone. -# $Id: wiki_wiki.cgi,v 1.37 2012/08/06 19:42:11 papu Exp $ +# $Id: wiki_wiki.cgi,v 1.38 2012/08/08 05:19:29 papu Exp $ # # "PyukiWiki" ver 0.2.1-alpha2-dev3 $$ # Copyright (C) 2004-2007 Nekyo @@ -243,7 +243,7 @@ if($::lang eq 'ja' && $::defaultcode ne $::kanjicode) { $body=&code_convert(\$body, $::kanjicode); } - &escapeoff if($::use_escapeoff > 0 && $::escapeoff_exec ne 1); + &escapeoff($::use_escapeoff) if($::use_escapeoff > 0 && $::escapeoff_exec ne 1); &content_output($::HTTP_HEADER, $body); }
