urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfixes

master
joey 2006-11-26 20:50:46 +00:00
parent b1a0a59212
commit fc11e4ad81
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IkiWiki/Plugin/poll.pm
View File

@ -94,6 +94,7 @@ sub cgi ($) { #{{{
if (defined $oldchoice && $oldchoice eq $choice) { if (defined $oldchoice && $oldchoice eq $choice) {
# Same vote; no-op. # Same vote; no-op.
IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page)); IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page));
exit;
} }
my $content=readfile(srcfile($pagesources{$page})); my $content=readfile(srcfile($pagesources{$page}));
@ -104,28 +105,13 @@ sub cgi ($) { #{{{
my $escape=shift; my $escape=shift;
my $params=shift; my $params=shift;
return "\\[[poll $params]]" if $escape; return "\\[[poll $params]]" if $escape;
return $params unless --$num == 0; if (--$num == 0) {
my @bits=split(' ', $params); $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se;
my @ret; if (defined $oldchoice) {
while (@bits) { $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1)." \"$oldchoice\"".$3/se;
my $n=shift @bits;
if ($n=~/=/) {
# val=param setting
push @ret, $n;
next;
} }
my $c=shift @bits;
$c=~s/^"(.*)"/$1/g;
next unless defined $n && defined $c;
if ($c eq $choice) {
$n++;
}
if (defined $oldchoice && $c eq $oldchoice) {
$n--;
}
push @ret, $n, "\"$c\"";
} }
return "[[poll ".join(" ", @ret)."]]"; return "[[poll $params]]";
}; };
$content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg; $content =~ s{(\\?)\[\[poll\s+([^]]+)\s*\]\]}{$edit->($1, $2)}seg;

2
doc/news/openid.mdwn
View File

@ -10,6 +10,6 @@ log back in, try out the OpenID signup process if you don't already have an
OpenID, and see how OpenID works for you. And let me know your feelings about OpenID, and see how OpenID works for you. And let me know your feelings about
making such a switch. making such a switch.
[[poll 0 ""Accept" only "OpenID" for "logins"" 0 ""Accept" only "password" logins" "0" "Accept "both""]] [[poll 0 "Accept only OpenID for logins" 0 "Accept only password logins" 0 "Accept both"]]
--[[Joey]] --[[Joey]]