PyukiWiki CVS Commit
pyuki****@lists*****
2012年 2月 27日 (月) 11:38:20 JST
Index: PyukiWiki-Devel/lib/debug.inc.pl diff -u PyukiWiki-Devel/lib/debug.inc.pl:1.458 PyukiWiki-Devel/lib/debug.inc.pl:1.459 --- PyukiWiki-Devel/lib/debug.inc.pl:1.458 Mon Feb 27 07:31:13 2012 +++ PyukiWiki-Devel/lib/debug.inc.pl Mon Feb 27 11:38:19 2012 @@ -1,6 +1,6 @@ ###################################################################### # debug.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: debug.inc.pl,v 1.458 2012/02/26 22:31:13 papu Exp $ +# $Id: debug.inc.pl,v 1.459 2012/02/27 02:38:19 papu Exp $ # # "PyukiWiki" version 0.2.0-p2-preview4 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -27,7 +27,7 @@ sub plugin_debug_init { my $head=<<EOM; <script type="text/javascript"><!-- -function Display(b,a){if(d.all||d.getElementById){if(d.all){obj=d.all(b).style}else{if(d.getElementById){obj=d.getElementById(b).style}}if(a=="view"){obj.display="block"}else{if(a=="none"){obj.display="none"}else{if(obj.display=="block"){obj.display="none"}else{if(obj.display=="none"){obj.display="block"}}}}}}; +eval(function(p,a,c,k,e,d){e=function(c){return c.toString(36)};if(!''.replace(/^/,String)){while(c--){d[c.toString(a)]=k[c]||c.toString(a)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('c b(7,8){1(d.6||d.5){1(d.6){0=d.6(7).a}3 1(d.5){0=d.5(7).a}1(8=="e"){0.2="9"}3 1(8=="4"){0.2="4"}3 1(0.2=="9"){0.2="4"}3 1(0.2=="4"){0.2="9"}}}',15,15,'obj|if|display|else|none|getElementById|all|id|mode|block|style|Display|function||view'.split('|'),0,{})) //--></script> EOM Index: PyukiWiki-Devel/lib/linktrack.inc.pl diff -u PyukiWiki-Devel/lib/linktrack.inc.pl:1.331 PyukiWiki-Devel/lib/linktrack.inc.pl:1.332 --- PyukiWiki-Devel/lib/linktrack.inc.pl:1.331 Mon Feb 27 07:31:13 2012 +++ PyukiWiki-Devel/lib/linktrack.inc.pl Mon Feb 27 11:38:19 2012 @@ -1,6 +1,6 @@ ###################################################################### # linktrack.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: linktrack.inc.pl,v 1.331 2012/02/26 22:31:13 papu Exp $ +# $Id: linktrack.inc.pl,v 1.332 2012/02/27 02:38:19 papu Exp $ # # "PyukiWiki" version 0.2.0-p2-preview4 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -36,7 +36,7 @@ sub plugin_linktrack_init { my $header=<<EOM; <script type="text/javascript"><!-- -function Ck(c,f){var b="&",e="?cmd=ck"+b,g=e+c,a;if(f=="r"){g=e+"r=y"+b+c;d.location=g;return true}else{if(f!=""){ou(g,f)}else{d.location=g}}return false}; +eval(function(p,a,c,k,e,d){e=function(c){return c.toString(36)};if(!''.replace(/^/,String)){while(c--){d[c.toString(a)]=k[c]||c.toString(a)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('c b(4,2){f 3="&3;",1="?1=a"+3,0=1+4,e;5(2==\'6\'){0=1+"6=j"+3+4;d.8=0;9 g}7 5(2!=\'\'){h(0,2)}7{d.8=0}9 i}',20,20,'lk|cmd|tg|amp|link|if|r|else|location|return|ck|Ck|function||ret|var|true|ou|false|y'.split('|'),0,{})) //--></script> EOM return ('init'=>1 , 'header'=>$header Index: PyukiWiki-Devel/lib/wiki.cgi diff -u PyukiWiki-Devel/lib/wiki.cgi:1.676 PyukiWiki-Devel/lib/wiki.cgi:1.677 --- PyukiWiki-Devel/lib/wiki.cgi:1.676 Mon Feb 27 07:52:51 2012 +++ PyukiWiki-Devel/lib/wiki.cgi Mon Feb 27 11:38:19 2012 @@ -1,6 +1,6 @@ ###################################################################### # wiki.cgi - This is PyukiWiki, yet another Wiki clone. -# $Id: wiki.cgi,v 1.676 2012/02/26 22:52:51 papu Exp $ +# $Id: wiki.cgi,v 1.677 2012/02/27 02:38:19 papu Exp $ # # "PyukiWiki" version 0.2.0-p2-preview4 $$ # Copyright (C) 2004-2012 Nekyo @@ -116,6 +116,11 @@ $::highlight_exec=0; #nocompact +$::linesave=0; # save lines for plugin flag # comment +$::linedata; # save lines for plugin # comment +$::eom_string; # end of message for plugin # comment +$::exec_inlinefunc; # exec inline func # comment + @::notes = (); # iniファイル読み込み # comment @@ -2315,7 +2320,20 @@ $lines--; next if($_ eq '#freeze'); @col_style=() if(!/^(\,|\|)/); - chomp; +# chomp; + # add 0.2.0-p2 + if($::linesave ne 0) { + if($_ eq $::eom_string) { + $::linesave=0; + $::eom_string=""; + $::linedata=~s/\n$//g; + push(@result, &$::exec_inlinefunc($::linedata)); + $::linedata=""; + next; + } + $::linedata.="$_\n"; + next; + } # backline if($backline ne '') {
