PyukiWiki CVS Commit
pyuki****@lists*****
2012年 7月 27日 (金) 23:35:47 JST
Index: PyukiWiki-Devel/plugin/ad.inc.pl diff -u PyukiWiki-Devel/plugin/ad.inc.pl:1.362 PyukiWiki-Devel/plugin/ad.inc.pl:1.363 --- PyukiWiki-Devel/plugin/ad.inc.pl:1.362 Mon Jul 16 22:36:27 2012 +++ PyukiWiki-Devel/plugin/ad.inc.pl Fri Jul 27 23:35:47 2012 @@ -1,8 +1,8 @@ ###################################################################### # ad.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: ad.inc.pl,v 1.362 2012/07/16 13:36:27 papu Exp $ +# $Id: ad.inc.pl,v 1.363 2012/07/27 14:35:47 papu Exp $ # -# "ad" ver 1.07 $$ +# "ad" ver 1.08 $$ # Author: Nanami http://nanakochi.daiba.cx/ # Copyright (C) 2004-2012 Nekyo # http://nekyo.qp.land.to/ @@ -18,7 +18,7 @@ ###################################################################### $PLUGIN="ad"; -$VERSION="1.07"; +$VERSION="1.08"; use strict; @@ -108,7 +108,9 @@ my $loop=1; $ret=~s/[\x0a|\x0d]//g; $ret=~s/<[Aa]\s/\f /g; - $ret=~s/\f(([^<]*))[Hh][Rr][Ee][Ff]="?(($::isurl))"?(([^<]*))>(([^\f]*))<\/[Aa]>/@{[&make_link_target("$::script?cmd=ad&c=@{[$loop++]}&p=@{[&dbmname($::form{mypage})]}&l=$id", "adlink", "_blank", $8, 1)]}$8<\/a>/g; +# $ret=~s/\f(([^<]*))[Hh][Rr][Ee][Ff]="?(($::isurl))"?(([^<]*))>(([^\f]*))<\/[Aa]>/@{[&make_link_target("$::script?cmd=ad&c=@{[$loop++]}&p=@{[&dbmname($::form{mypage})]}&l=$id", "adlink", "_blank", $8, 1)]}$8<\/a>/g; + $ret=~s/\f(([^<]*))[Hh][Rr][Ee][Ff]="?(($::isurl))"?(([^<]*))>(([^\f]*))<\/[Aa]>/<a href="$4" target="_blank" class="adlink">$8<\/a>/g; + $ret=~s/(($::isurl))/@{["$::script?cmd=ad&c=@{[$loop++]}&p=@{[&dbmname($::form{mypage})]}&l=$id"]}/g; # $ret=~s/<[Ii][Mm][Gg] (([^<]*)) width="1p?x?" height="1p?x?" (([^<]*))>/<img $1 class="addmy" $3>/g; $ret=~s/<[Ii][Mm][Gg] (([^<]*)) width="1p?x?" height="1p?x?" (([^<]*))>//g; if($::AD_LOADED eq 0) { @@ -177,8 +179,9 @@ foreach my $key(keys %::AD_DB_HTML) { if($key=~/$id$/) { my $tmphtml=$::AD_DB_HTML{$key}; - my @url=$tmphtml=~/<[Aa].+?[Hh][Rr][Ee][Ff]="($::isurl)"/g; + my @url=$tmphtml=~/($::isurl)/g; my $url=$url[$c-1]; +#print "Content-type: text/html\n\n"; print &http_header("Status: 302","Location: $url\n\n"); if(&plugin_ad_pyukiver >= 1) { require "plugin/counter.inc.pl";
