Changeset 4084

Timestamp:

06/10/09 16:37:46 (3 years ago)

Author:

CrawfordCurrie

Message:

Item8010: ported to Foswiki

Location:

trunk/VotePlugin

Files:

• data/System (moved) (moved from trunk/VotePlugin/data/TWiki)
• data/System/VarVOTE.txt (modified) (1 diff)
• data/System/VotePlugin.txt (modified) (9 diffs)
• lib/Foswiki (moved) (moved from trunk/VotePlugin/lib/TWiki)
• lib/Foswiki/Plugins/VotePlugin.pm (modified) (3 diffs)
• lib/Foswiki/Plugins/VotePlugin/Core.pm (modified) (31 diffs)
• lib/Foswiki/Plugins/VotePlugin/DEPENDENCIES (modified) (1 diff)
• lib/Foswiki/Plugins/VotePlugin/MANIFEST (modified) (1 diff)
• lib/Foswiki/Plugins/VotePlugin/build.pl (modified) (1 diff)
• pub/System (moved) (moved from trunk/VotePlugin/pub/TWiki)

trunk/VotePlugin/data/System/VarVOTE.txt

@@ -1 @@
-%META:TOPICINFO{author="ProjectContributor" date="1182547552" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="Macros"}%
 #VarVOTE
----+++ VOTE{ _attributes_ } -- define a poll in a TWiki topic.
+---+++ VOTE{ _attributes_ } -- define a poll in a topic.
 %INCLUDE{"%SYSTEMWEB%.VotePlugin" section="vote_attributes"}%
    * See VotePlugin for more information

trunk/VotePlugin/data/System/VotePlugin.txt

@@ -30 +30 @@
 You can choose whether to save the resuts of the vote in a _topic_ or in a
 _secret place_. If you choose to save the results in a topic, you can protect
-that topic using the normal TWiki access control mechanisms, and the vote
+that topic using the normal wiki access control mechanisms, and the vote
 will still work. Saving in a topic has the advantage that you can easily
-post-process the results in TWiki, but it's a bit more work to set up so
+post-process the results, but it's a bit more work to set up so
 polls are saved in a _secret place_ by default.
 
 Polls are either _local_ to the topic they are defined in, or are _global_ to
-the entire TWiki. Each poll has an _ID_ which distinguishes it from other
+the entire wiki. Each poll has an _ID_ which distinguishes it from other
 polls. These IDs are local to the topic for local polls, but can be shared
 between topics if the poll is made _global_.
@@ -43 +43 @@
 
 ---++ Example
-You create a poll using the %VOTE twiki variable. For example,
+You create a poll using the %VOTE macro. For example,
 
 =%<nop>VOTE{id="FavouriteMeal" select1="Drink" options1="Beer,Wine,Milk,Water" select2="Food" options2="Steak,Bread,Pasta,Pizza"}%=
@@ -63 +63 @@
 ---++ Syntax
 #StandardAttrs
-Write =%<nop>VOTE{ ... }%= in the text of a a TWiki topic to define a poll
+Write =%<nop>VOTE{ ... }%= in the text of a topic to define a poll
 %STARTSECTION{"vote_attributes"}%
    * The following standard attributes are recognized
@@ -93 +93 @@
    | =open= | If set to ="off"= this is a closed vote. If set to ="on"= it is open (the default) | =open="on"= |
    | =secret= | If set to ="off"=, then the database will record who voted. If set to ="on"=, votes are secret (the default) | =secret="on"= |
-   | =saveto= | If set to the name of a topic, the poll results will be appended to the end of that topic. The results are formatted as a TWiki table for easy post-processing. | =saveto="Main.<nop>VoteResults"= |
+   | =saveto= | If set to the name of a topic, the poll results will be appended to the end of that topic. The results are formatted as a table for easy post-processing. | =saveto="Main.<nop>VoteResults"= |
    | =bayesian= | If set to ="on"=, rating averages will be computed using the Bayesian average of this item against all the other items _that have the same item in their =stars= field_. This requires all the participating %VOTEs to be =global=, or to save their results to the same place using =saveto=. See http://www.thebroth.com/blog/118/bayesian-rating for more information about Bayesian rating. | =bayesian="off"= |
    | =submit= | If set to ="off"=, this makes the %VOTE display the results of the vote without prompting for any input. This is useful when - for example - you want to show the results of a global vote, without permitting more voting. |
@@ -106 +106 @@
    *<nop> Set VOTEPLUGIN_DEFAULTS = open="on" global="on" bayesian="on"
 </pre>
- You can do this in an individual topic, for an entire web (in !WebPreferences), or for the whole TWiki (in !%USERSWEB%.SitePreferences).
+ You can do this in an individual topic, for an entire web (in !WebPreferences), or for the whole wiki (in !%USERSWEB%.SitePreferences).
 
 #FormattingResults
 ---+++ Formatting the Results of a Poll
-Each item in the poll has a results display next to it (are as part of it in the case of stars). The =format= parameter is used to control how this is displayed. It is usually used to define a row in a TWiki table, and is expands once for each =stars= and once for each option in a =select=.
+Each item in the poll has a results display next to it (are as part of it in the case of stars). The =format= parameter is used to control how this is displayed. It is usually used to define a row in a table, and is expands once for each =stars= and once for each option in a =select=.
 
 The =format= parameter is a string that can include the following formatting tokens:
@@ -144 +144 @@
 
 ---+++ Weighting the vote
-You can weight the vote results by setting the !TWikiPreference
+You can weight the vote results by setting the !Preference
 =%<nop>VOTEPLUGIN_WEIGHTINGS%= to the name of a topic that is used
 to weight the votes of certain members of the community in the final result.
@@ -162 +162 @@
 #Reset
 ---+++ Resetting a Poll
-Sometimes you want to be able to clear the results of a poll. Access to this feature is controlled using the =VOTEPLUGIN_RESETTERS= TWiki variable. This variable defines a (semicolon-separated) list of wiki names and a (comma-separated) list of the IDs of votes they are allowed to reset. You can use =*= as a wildcard in the vote IDs. For example, in a =Web<nop>Preferences= topic you can write
+Sometimes you want to be able to clear the results of a poll. Access to this feature is controlled using the =VOTEPLUGIN_RESETTERS= macro. This variable defines a (semicolon-separated) list of wiki names and a (comma-separated) list of the IDs of votes they are allowed to reset. You can use =*= as a wildcard in the vote IDs. For example, in a =Web<nop>Preferences= topic you can write
 <verbatim>
    * Set VOTEPLUGIN_RESETTERS = GeorgeWBush(*);RobertMugabe(zimbabwe);SimonCowell(*Idol, XFactor)
@@ -189 +189 @@
    * Set SHORTDESCRIPTION = Simple way to count votes
 -->
-|  Plugin Author: | TWiki:Main/MichaelDaum |
+|  Plugin Author: | Foswiki:Main/MichaelDaum |
 |  Copyright &copy;: | 2005-2007, Michael Daum http://wikiring.de |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
 |  Plugin Version: | %$VERSION% |
 |  Change History: | &nbsp; | 
-|  14 Oct 2008 | TWikibug:Item6070 works for hierarchical webs now.  - TWiki:Main/ColasNahaboo |
-|  10 Aug 2008 | TWikibug:Item5768 suppress submission of individual ratings in a multi-row vote TWikibug:Item5769 correct default handling of transcluded rates TWikibug:Item5766 $large is once again large TWikibug:Item5771 support for resetting votes. |
-|  1 Jul 2007: | TWikibug:Item4310 : abstracted out Foswiki:Extensions.RatingContrib, and modified the code to be tolerant of forms within forms - TWiki:Main/CrawfordCurrie |
-|  24 Jun 2007: | TWikibug:ItemItem4298: fixed secret switch. Item4200: added VarVOTE. - TWiki:Main/CrawfordCurrie |
-|  11 Jun 2007: | TWikibug:Item4235 - removed excess newlines, fixed separator - TWiki:Main/CrawfordCurrie |
-|   8 Jun 2007: | Added =submit= - TWiki:Main/CrawfordCurrie |
-|   6 Jun 2007: | Added =global=, =open=, =secret=, =format=, =chart=, =saveto=, =VOTEPLUGIN_WEIGHTINGS=, bayesian averaging - TWiki:Main/CrawfordCurrie |
+|  10 Jun 2009 | Foswikitask:Item8010: incorporate upstream fixes, and port to Foswiki - Foswiki:Main/CrawfordCurrie |
+|  14 Oct 2008 | Item6070 works for hierarchical webs now. - Foswiki:Main/ColasNahaboo |
+|  10 Aug 2008 | Item5768 suppress submission of individual ratings in a multi-row vote Item5769 correct default handling of transcluded rates Item5766 $large is once again large Item5771 support for resetting votes. |
+|  1 Jul 2007: | Item4310 : abstracted out Foswiki:Extensions.RatingContrib, and modified the code to be tolerant of forms within forms - Foswiki:Main/CrawfordCurrie |
+|  24 Jun 2007: | Item4298: fixed secret switch. Item4200: added VarVOTE. - Foswiki:Main/CrawfordCurrie |
+|  11 Jun 2007: | Item4235 - removed excess newlines, fixed separator - Foswiki:Main/CrawfordCurrie |
+|   8 Jun 2007: | Added =submit= - Foswiki:Main/CrawfordCurrie |
+|   6 Jun 2007: | Added =global=, =open=, =secret=, =format=, =chart=, =saveto=, =VOTEPLUGIN_WEIGHTINGS=, bayesian averaging - Foswiki:Main/CrawfordCurrie |
 |  31 Aug 2006: | added NO_PREFS_IN_TOPIC |
 |  15 Aug 2006: | added "use strict" and fixed revealing errors |
@@ -221 +222 @@
 %META:FILEATTACHMENT{name="example_stars.gif" attr="h" comment="" version="1"}%
 
--- TWiki:Main.MichaelDaum - 31 Aug 2006
+-- Foswiki:Main.MichaelDaum - 31 Aug 2006

trunk/VotePlugin/lib/Foswiki/Plugins/VotePlugin.pm

@@ -11 +11 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details, published at 
+# GNU General Public License for more details, published at
 # http://www.gnu.org/copyleft/gpl.html
 
 ###############################################################################
-package TWiki::Plugins::VotePlugin;
+package Foswiki::Plugins::VotePlugin;
 use strict;
 
@@ -24 +24 @@
 );
 
-$VERSION = '$Rev$';
-$RELEASE = '1.33';
+$VERSION           = '$Rev$';
+$RELEASE           = '1.33';
 $NO_PREFS_IN_TOPIC = 1;
-$SHORTDESCRIPTION = 'Simple way to count votes';
+$SHORTDESCRIPTION  = 'Simple way to count votes';
 
 ###############################################################################
 sub initPlugin {
-    my ($topic, $web) = @_;
+    my ( $topic, $web ) = @_;
     $isInitialized = 0;
-    require TWiki::Func;
-    TWiki::Func::registerTagHandler('VOTE', \&handleVote);
+    require Foswiki::Func;
+    Foswiki::Func::registerTagHandler( 'VOTE', \&handleVote );
     return 1;
 }
@@ -40 +40 @@
 ###############################################################################
 sub handleVote {
+
     #my ($session, $params, $topic, $web) = @_;
 
     unless ($isInitialized) {
-        eval 'use TWiki::Plugins::VotePlugin::Core;';
+        eval 'use Foswiki::Plugins::VotePlugin::Core;';
         die $@ if $@;
         $isInitialized = 1;
+
         # Register vote now so we only get it done once per topic. It doesn't
         # matter which %VOTE triggers this, as the query carries all the info
         # about where to save the data, the id etc.
-        TWiki::Plugins::VotePlugin::Core::registerVote();
+        Foswiki::Plugins::VotePlugin::Core::registerVote();
     }
 
-    return TWiki::Plugins::VotePlugin::Core::handleVote(@_);
+    return Foswiki::Plugins::VotePlugin::Core::handleVote(@_);
 }
 

trunk/VotePlugin/lib/Foswiki/Plugins/VotePlugin/Core.pm

@@ -11 +11 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details, published at 
+# GNU General Public License for more details, published at
 # http://www.gnu.org/copyleft/gpl.html
 
 ###############################################################################
-package TWiki::Plugins::VotePlugin::Core;
+package Foswiki::Plugins::VotePlugin::Core;
 
 ###############################################################################
@@ -25 +25 @@
 use CGI;
 
-$debug = 0; # toggle me
+$debug = 0;    # toggle me
 
 ###############################################################################
 sub handleVote {
-    my ($session, $params, $topic, $web) = @_;
-
-    $web = TWiki::Func::expandCommonVariables('%BASEWEB%');
-    $topic = TWiki::Func::expandCommonVariables('%BASETOPIC%');
+    my ( $session, $params, $topic, $web ) = @_;
+
+    $web   = Foswiki::Func::expandCommonVariables('%BASEWEB%');
+    $topic = Foswiki::Func::expandCommonVariables('%BASETOPIC%');
 
     unless ($pubUrlPath) {
-        $pubUrlPath = TWiki::Func::getPubUrlPath().'/'.TWiki::Func::getTwikiWebname().'/VotePlugin';
-    }
-
-    my $defaults = TWiki::Func::getPreferencesValue('VOTEPLUGIN_DEFAULTS')
+        $pubUrlPath =
+            Foswiki::Func::getPubUrlPath() . '/'
+          . $Foswiki::cfg{SystemWebName}
+          . '/VotePlugin';
+    }
+
+    my $defaults = Foswiki::Func::getPreferencesValue('VOTEPLUGIN_DEFAULTS')
       || '';
 
-    while ($defaults =~ s/^\s*(\w+)=\"(.*?)\"//) {
+    while ( $defaults =~ s/^\s*(\w+)=\"(.*?)\"// ) {
         $params->{$1} = $2 unless defined $params->{$1};
     }
 
-    my $id =       defined($params->{id}) ? $params->{id} : '_default';
-    my $isGlobal = isTrue($params->{global}, 0);
-    my $isOpen =   isTrue($params->{open}, 1);
-    my $isSecret = isTrue($params->{secret}, 1);
-    my $bayesian = isTrue($params->{bayesian}, 0);
-    my $submit =   isTrue($params->{submit}, 1);
-    my $saveto =   $params->{saveto};
+    my $id = defined( $params->{id} ) ? $params->{id} : '_default';
+    my $isGlobal = isTrue( $params->{global},   0 );
+    my $isOpen   = isTrue( $params->{open},     1 );
+    my $isSecret = isTrue( $params->{secret},   1 );
+    my $bayesian = isTrue( $params->{bayesian}, 0 );
+    my $submit   = isTrue( $params->{submit},   1 );
+    my $saveto   = $params->{saveto};
     my $canReset = canReset($id);
 
@@ -57 +60 @@
 
     my $defaultStarsFormat =
-      '| $key$reset | $small<div class="star-info">Score: $score, My vote: $mylast, Total votes: $sum</div> |';
-    my $defaultSelectFormat =  '| $key$reset | $prompt | $bars |';
-    my $defaultChartFormat = '<div>$bar(300) $option $perc% ($score)</div>';
-
-    if (defined($params->{style})) {
+'| $key$reset | $small<div class="star-info">Score: $score, My vote: $mylast, Total votes: $sum</div> |';
+    my $defaultSelectFormat = '| $key$reset | $prompt | $bars |';
+    my $defaultChartFormat  = '<div>$bar(300) $option $perc% ($score)</div>';
+
+    if ( defined( $params->{style} ) ) {
+
         # Compatibility
         my $format = '';
-        if ($params->{style} =~ /perc/) {
+        if ( $params->{style} =~ /perc/ ) {
             $format .= '$perc% ';
         }
-        if ($params->{style} =~ /total/) {
+        if ( $params->{style} =~ /total/ ) {
             $format .= '($freq)';
         }
-        if ($params->{style} =~ /sum/) {
+        if ( $params->{style} =~ /sum/ ) {
             $format .= '$sum votes';
         }
@@ -80 +84 @@
 
     # Compatibility
-    if (defined($params->{select})) {
-        push(@prompts, {
-            type => 'select',
-            name => expandFormattingTokens($params->{select}),
-            format => $defaultSelectFormat,
-            options =>
-              [ map { expandFormattingTokens($_) }
-                  split(/\s*,\s*/, $params->{options} || '') ]});
+    if ( defined( $params->{select} ) ) {
+        push(
+            @prompts,
+            {
+                type    => 'select',
+                name    => expandFormattingTokens( $params->{select} ),
+                format  => $defaultSelectFormat,
+                options => [
+                    map { expandFormattingTokens($_) }
+                      split( /\s*,\s*/, $params->{options} || '' )
+                ]
+            }
+        );
     }
 
     my $n = 1;
     while (1) {
-        if (defined($params->{"select$n"})) {
-            push(@prompts, {
-                type => 'select',
-                name => expandFormattingTokens($params->{"select$n"}),
-                format => $params->{"format$n"} || $defaultSelectFormat,
-                chart => $params->{"chart$n"} || $defaultChartFormat,
-                options =>
-                  [ map { expandFormattingTokens($_) }
-                      split(/\s*,\s*/, $params->{"options$n"} || '') ]});
-        } elsif (defined($params->{"stars$n"})) {
-            unless (($params->{"width$n"} || 5) =~ /^\d+$/) {
+        if ( defined( $params->{"select$n"} ) ) {
+            push(
+                @prompts,
+                {
+                    type    => 'select',
+                    name    => expandFormattingTokens( $params->{"select$n"} ),
+                    format  => $params->{"format$n"} || $defaultSelectFormat,
+                    chart   => $params->{"chart$n"} || $defaultChartFormat,
+                    options => [
+                        map { expandFormattingTokens($_) }
+                          split( /\s*,\s*/, $params->{"options$n"} || '' )
+                    ]
+                }
+            );
+        }
+        elsif ( defined( $params->{"stars$n"} ) ) {
+            unless ( ( $params->{"width$n"} || 5 ) =~ /^\d+$/ ) {
                 return inlineError("Expected integer width for stars$n=");
             }
-            push(@prompts, {
-                type => 'stars',
-                name => $params->{"stars$n"},
-                format => $params->{"format$n"} || $defaultStarsFormat,
-                width => $params->{"width$n"} || 5 });
-        } else {
+            push(
+                @prompts,
+                {
+                    type   => 'stars',
+                    name   => $params->{"stars$n"},
+                    format => $params->{"format$n"} || $defaultStarsFormat,
+                    width  => $params->{"width$n"} || 5
+                }
+            );
+        }
+        else {
             last;
         }
@@ -117 +137 @@
 
     # check attributes
-    if (!scalar(@prompts)) {
-        return inlineError("no prompts specified ".$params->stringify());
+    if ( !scalar(@prompts) ) {
+        return inlineError( "no prompts specified " . $params->stringify() );
     }
 
     my $mess;
     if ($canReset) {
-        my $query = TWiki::Func::getCgiQuery();
-        if (defined $query->param('Reset'.$id)) {
-            clearVotesData($web, $topic, $id, $isGlobal, $saveto);
+        my $query = Foswiki::Func::getCgiQuery();
+        if ( defined $query->param( 'Reset' . $id ) ) {
+            clearVotesData( $web, $topic, $id, $isGlobal, $saveto );
             $mess = "$id has been reset";
         }
@@ -131 +151 @@
 
     # read in the votes
-    my $lines = getVoteData($web, $topic, $id, $isGlobal, $saveto);
+    my $lines = getVoteData( $web, $topic, $id, $isGlobal, $saveto );
     my %votes;
 
     my %lastVote;
-    foreach my $line (split/\r?\n/, $lines) {
-        if ($line =~ /^\|(.*)\|$/) {
-            my @data = split(/\|/, $1);
-            my $vid = $data[0];
-            my $voter = $data[1];
+    foreach my $line ( split /\r?\n/, $lines ) {
+        if ( $line =~ /^\|(.*)\|$/ ) {
+            my @data   = split( /\|/, $1 );
+            my $vid    = $data[0];
+            my $voter  = $data[1];
             my $weight = $data[2];
-            my $date = (scalar(@data) > 4) ? $data[4] : '';
-
-            foreach my $item (split(/,/, $data[3] || '')) {
-                if ($item =~ /^(.+)=(.+)$/) {
-                    my ($row, $choice) = ($1, $2);
+            my $date   = ( scalar(@data) > 4 ) ? $data[4] : '';
+
+            foreach my $item ( split( /,/, $data[3] || '' ) ) {
+                if ( $item =~ /^(.+)=(.+)$/ ) {
+                    my ( $row, $choice ) = ( $1, $2 );
                     $votes{$voter}{$vid}{$row} = [ $choice, $weight, $date ];
                 }
             }
-        } elsif (!$saveto && $line =~ /^([^\|]+)\|([^\|]+)\|(.*?)\|(.+)$/) {
+        }
+        elsif ( !$saveto && $line =~ /^([^\|]+)\|([^\|]+)\|(.*?)\|(.+)$/ ) {
+
             # Old format - compatibility only
-            my $date = $1;
-            my $voter = $2;
+            my $date   = $1;
+            my $voter  = $2;
             my $weight = $3;
-            my $data = $4;
-            foreach my $item (split(/\|/, $data)) {
-                if ($item =~ /^(.+)=(.+)$/) {
-                    my ($row, $choice) = ($1, $2);
+            my $data   = $4;
+            foreach my $item ( split( /\|/, $data ) ) {
+                if ( $item =~ /^(.+)=(.+)$/ ) {
+                    my ( $row, $choice ) = ( $1, $2 );
                     $votes{$voter}{$id}{$row} = [ $choice, $weight, $date ];
                 }
@@ -176 +198 @@
     # leaf value, so the frequency of that value should be the same as the
     # total number of votes for the key.
-    my %keyValueFreq; # frequency of a specific value for a given key
-    my %totalVotes;   # total votes for a given key
-    my %totalVoters;  # how many different people voted for each key
-    my %totalRate;    # Total of all ratings for each key
-    my %items;        # Hash of id's that have the same key
-    my $voteSum = 0;  # Sum of the number of votes on all rated items
-    my $rateSum = 0;  # Sum of all ratings of rated items
-    foreach my $voter (keys %votes) {
-        foreach my $vid (keys %{$votes{$voter}}) {
-            foreach my $key (keys %{$votes{$voter}{$vid}}) {
+    my %keyValueFreq;    # frequency of a specific value for a given key
+    my %totalVotes;      # total votes for a given key
+    my %totalVoters;     # how many different people voted for each key
+    my %totalRate;       # Total of all ratings for each key
+    my %items;           # Hash of id's that have the same key
+    my $voteSum = 0;     # Sum of the number of votes on all rated items
+    my $rateSum = 0;     # Sum of all ratings of rated items
+
+    foreach my $voter ( keys %votes ) {
+        foreach my $vid ( keys %{ $votes{$voter} } ) {
+            foreach my $key ( keys %{ $votes{$voter}{$vid} } ) {
                 my $choice = $votes{$voter}{$vid}{$key}->[0];
                 my $weight = $votes{$voter}{$vid}{$key}->[1];
@@ -192 +215 @@
                 $items{$key}{$vid} = 1;
                 $voteSum += $weight;
-                if ($choice =~ /^[\d.]+$/) {
+                if ( $choice =~ /^[\d.]+$/ ) {
                     $totalRate{$key} += $choice * $weight;
                     $rateSum += $choice * $weight;
@@ -203 +226 @@
     my $act;
     if ($isOpen) {
-        $act = TWiki::Func::getScriptUrl($web, $topic, 'view');
-    } else {
-        $act = TWiki::Func::getScriptUrl($web, $topic, 'viewauth');
+        $act = Foswiki::Func::getScriptUrl( $web, $topic, 'view' );
+    }
+    else {
+        $act = Foswiki::Func::getScriptUrl( $web, $topic, 'viewauth' );
     }
 
@@ -213 +237 @@
         vote_isGlobal => $isGlobal,
         vote_isSecret => $isSecret,
-        vote_isOpen => $isOpen,
-        vote_saveTo => $saveto,
-        vote_inTopic => "$web.$topic",
-       );
+        vote_isOpen   => $isOpen,
+        vote_saveTo   => $saveto,
+        vote_inTopic  => "$web.$topic",
+    );
 
     # Do we need a submit button?
@@ -226 +250 @@
         my $row;
 
-        if ($prompt->{type} eq 'stars') {
-            my $numItems = scalar(keys(%{$items{$key}}));
+        if ( $prompt->{type} eq 'stars' ) {
+            my $numItems = scalar( keys( %{ $items{$key} } ) );
 
             # avg_num_votes: The average number of votes of all items that have
@@ -234 +258 @@
             # have num_votes>0)
             my $avg_num_votes = $numItems ? $voteSum / $numItems : 0;
-            my $avg_rating = $voteSum ? $rateSum / $voteSum : 0;
+            my $avg_rating    = $voteSum  ? $rateSum / $voteSum  : 0;
             my $myLastVote =
-              $votes{getIdent($isSecret, $isOpen)}{$id}{$key}->[0] || 0;
+              $votes{ getIdent( $isSecret, $isOpen ) }{$id}{$key}->[0] || 0;
             my $mean = 0;
-            if ($totalVotes{$key}) {
+            if ( $totalVotes{$key} ) {
                 $mean = $totalRate{$key} / $totalVotes{$key};
                 if ($bayesian) {
-                    $mean = ($avg_num_votes * $avg_rating +
-                               $totalVotes{$key} * $mean) /
-                                 ($avg_num_votes + $totalVotes{$key});
+                    $mean =
+                      ( $avg_num_votes * $avg_rating +
+                          $totalVotes{$key} * $mean ) /
+                      ( $avg_num_votes + $totalVotes{$key} );
                 }
             }
-            push(@rows, showLineOfStars(
-                $id, $prompt, $submit, $needSubmit, $act,
-                $mean, $myLastVote, $totalVoters{$key} || 0));
+            push(
+                @rows,
+                showLineOfStars(
+                    $id, $prompt, $submit, $needSubmit, $act, $mean,
+                    $myLastVote, $totalVoters{$key} || 0
+                )
+            );
         }
         else {
-            my $opts = CGI::option({selected=>'selected',
-                                    value=>''}, 'Select ...');
-
-            foreach my $optionName (@{$prompt->{options}}) {
+            my $opts = CGI::option(
+                {
+                    selected => 'selected',
+                    value    => ''
+                },
+                'Select ...'
+            );
+
+            foreach my $optionName ( @{ $prompt->{options} } ) {
                 $opts .= CGI::option($optionName);
             }
-            my $o = { name => 'vote_data_'.$key, size => 1 };
+            my $o = { name => 'vote_data_' . $key, size => 1 };
             unless ($needSubmit) {
                 $o->{onchange} = 'javascript: submit()';
             }
-            my $select = $submit ? CGI::Select($o, $opts) : '';
-
-            push(@rows, showSelect(
-                $id, $prompt, $submit, $select, $keyValueFreq{$id}{$key},
-                $totalVotes{$id}{$key}, $params));
-        }
-    }
-
-    my $result = join($separator, @rows);
+            my $select = $submit ? CGI::Select( $o, $opts ) : '';
+
+            push(
+                @rows,
+                showSelect(
+                    $id, $prompt, $submit, $select,
+                    $keyValueFreq{$id}{$key},
+                    $totalVotes{$key}, $params
+                )
+            );
+        }
+    }
+
+    my $result = join( $separator, @rows );
     if ($submit) {
         my $hiddens = '';
-        while (my ($k, $v) = each %hidden) {
-            $hiddens .= CGI::input(
-                { type => 'hidden', name => $k, value => $v });
-        }
+        while ( my ( $k, $v ) = each %hidden ) {
+            $hiddens .=
+              CGI::input( { type => 'hidden', name => $k, value => $v } );
+        }
+
         # Don't use CGI::form because it generates TML-busting newlines
-        my $form = CGI::start_form(-id => $id, -action => $act,
-                                  -method => 'post');
-        $form =~ s/\r?\n//g; # CGI::start_form adds unwanted \n's
-        $result = $form.$hiddens.$separator.$result;
+        my $form = CGI::start_form(
+            -id     => $id,
+            -action => $act,
+            -method => 'post'
+        );
+        $form =~ s/\r?\n//g;    # CGI::start_form adds unwanted \n's
+        $result = $form . $hiddens . $separator . $result;
         if ($needSubmit) {
-            $result .= $separator.CGI::submit(
-                { name=> 'OK', value=>'OK',
-                  style=>'color:green'});
-        }
-        $result .= $separator.CGI::end_form();
+            $result .= $separator
+              . CGI::submit(
+                {
+                    name  => 'OK',
+                    value => 'OK',
+                    style => 'color:green'
+                }
+              );
+        }
+        $result .= $separator . CGI::end_form();
     }
 
     if ($canReset) {
         if ($mess) {
-            $mess = CGI::span({class => 'twikiAlert'}, $mess);
-        } else {
-            $mess = CGI::start_form(-name => 'resetForm',
-                                    -action => '');
-            $mess =~ s/\r?\n//g; # CGI::start_form adds unwanted \n's
-            $mess .= CGI::submit({ name => 'Reset'.$id, value=>'Reset'})
+            $mess = CGI::span( { class => 'foswikiAlert' }, $mess );
+        }
+        else {
+            $mess = CGI::start_form(
+                -name   => 'resetForm',
+                -action => ''
+            );
+            $mess =~ s/\r?\n//g;    # CGI::start_form adds unwanted \n's
+            $mess .=
+                CGI::submit( { name => 'Reset' . $id, value => 'Reset' } )
               . CGI::end_form();
         }
         $result =~ s/\$reset/ $mess /g;
-    } else {
+    }
+    else {
         $result =~ s/\$reset//g;
     }
 
     # Render tables and remove newlines
-    # so we can embed votes in TWiki tables
-    $result = TWiki::Func::renderText($result);
+    # so we can embed votes in tables
+    $result = Foswiki::Func::renderText($result);
     $result =~ s/\n//g;
     return $result;
@@ -317 +370 @@
     my $id = shift;
 
-    my $controls = TWiki::Func::getPreferencesValue('VOTEPLUGIN_RESETTERS');
-    return '' unless (defined $controls);
-    foreach my $control (split(/\s*;\s*/, $controls)) {
+    my $controls = Foswiki::Func::getPreferencesValue('VOTEPLUGIN_RESETTERS');
+    return '' unless ( defined $controls );
+    foreach my $control ( split( /\s*;\s*/, $controls ) ) {
         next unless $control =~ /^\s*(\w+)\s*\((.*)\)\s*$/;
-        my ($who, $whats) = ($1, $2);
-        next unless $who eq TWiki::Func::getWikiName();
-        foreach my $ide (split(/\s*,\s*/, $whats)) {
+        my ( $who, $whats ) = ( $1, $2 );
+        next unless $who eq Foswiki::Func::getWikiName();
+        foreach my $ide ( split( /\s*,\s*/, $whats ) ) {
             $ide = quotemeta($ide);
             $ide =~ s/\\\*/.*/g;
             $ide =~ s/\\\?/./g;
-            if ($id =~ /^$ide$/) {
+            if ( $id =~ /^$ide$/ ) {
                 return 1;
             }
@@ -337 +390 @@
 ###############################################################################
 sub registerVote {
+
     #print STDERR "called registerVote()\n";
 
     # check parameters
-    my $query = TWiki::Func::getCgiQuery();
-    my $id = $query->param('vote_register');
+    my $query = Foswiki::Func::getCgiQuery();
+    my $id    = $query->param('vote_register');
 
     return unless defined $id;
@@ -347 +401 @@
     my $web;
     my $topic = $query->param('vote_inTopic');
-    ($web, $topic) = TWiki::Func::normalizeWebTopicName('', $topic);
-    my $user = TWiki::Func::getWikiUserName();
+    ( $web, $topic ) = Foswiki::Func::normalizeWebTopicName( '', $topic );
+    my $user = Foswiki::Func::getWikiUserName();
     my $isSecret = $query->param('vote_isSecret') || 0;
 
     my $isOpen = $query->param('vote_isOpen') || 0;
-    my $ident = getIdent($isSecret, $isOpen);
-#    $ident = int(rand(100)) 
-#      if $debug; # for testing
+    my $ident = getIdent( $isSecret, $isOpen );
+
+    #    $ident = int(rand(100))
+    #      if $debug; # for testing
 
     # Apply a weighting for the voting user
-    my $weightsTopic = TWiki::Func::getPreferencesValue(
-        'VOTEPLUGIN_WEIGHTINGS');
+    my $weightsTopic =
+      Foswiki::Func::getPreferencesValue('VOTEPLUGIN_WEIGHTINGS');
     my $weight = 1;
     if ($weightsTopic) {
-        my ($wweb, $wtopic) = TWiki::Func::normalizeWebTopicName(
-            $web, $weightsTopic);
-        if (TWiki::Func::topicExists($wweb, $wtopic)) {
-            my ($meta, $text) = TWiki::Func::readTopic($wweb, $wtopic);
-            foreach my $line (split(/\n/, $text)) {
-                if ($line =~ /^\|\s*(\S+)\s*\|\s*(\d+)\s*\|$/) {
-                    ($wweb, $wtopic) =  TWiki::Func::normalizeWebTopicName(
-                        undef, $1);
-                    if ($user eq "$wweb.$wtopic") {
+        my ( $wweb, $wtopic ) =
+          Foswiki::Func::normalizeWebTopicName( $web, $weightsTopic );
+        if ( Foswiki::Func::topicExists( $wweb, $wtopic ) ) {
+            my ( $meta, $text ) = Foswiki::Func::readTopic( $wweb, $wtopic );
+            foreach my $line ( split( /\n/, $text ) ) {
+                if ( $line =~ /^\|\s*(\S+)\s*\|\s*(\d+)\s*\|$/ ) {
+                    ( $wweb, $wtopic ) =
+                      Foswiki::Func::normalizeWebTopicName( undef, $1 );
+                    if ( $user eq "$wweb.$wtopic" ) {
                         $weight = $2 / 100.0;
                     }
@@ -380 +435 @@
     my $voteData = "|$id|$ident|$weight|";
     my @v;
-    foreach my $key ($query->param()) {
+    foreach my $key ( $query->param() ) {
         my $val = $query->param($key);
         next unless $key =~ s/^vote_data_//;
         push @v, "$key=$val";
     }
-    $voteData .= join(',', @v) . '|' . _getLocalDate() . "|\n";
-
-    saveVotesData($web, $topic, $id,  $query->param('vote_isGlobal') || 0,
-                  $query->param('vote_saveTo') || '', $voteData);
+    $voteData .= join( ',', @v ) . '|' . _getLocalDate() . "|\n";
+
+    saveVotesData(
+        $web, $topic, $id,
+        $query->param('vote_isGlobal') || 0,
+        $query->param('vote_saveTo')   || '', $voteData
+    );
+
     # invalidate cache entry
-    if (defined &TWiki::Cache::invalidateEntry) {
-        TWiki::Cache::invalidateEntry($web, $topic);
+    if ( defined &Foswiki::Cache::invalidateEntry ) {
+        Foswiki::Cache::invalidateEntry( $web, $topic );
     }
 }
 
 sub saveVotesData {
-    my ($web, $topic, $id, $isGlobal, $saveto, $voteData) = @_;
+    my ( $web, $topic, $id, $isGlobal, $saveto, $voteData ) = @_;
     if ($saveto) {
         my $text = '';
-        my $meta = '';
+        my $meta = '';
         $saveto =~ /(.*)/;
-        my ($vw, $vt) = TWiki::Func::normalizeWebTopicName($web, $1);
-        if (TWiki::Func::topicExists($vw, $vt)) {
-            ( $meta, $text ) = TWiki::Func::readTopic( $vw, $vt );
-        }
-        $text .= $voteData;
-        TWiki::Func::saveTopic($vw, $vt, $meta, $text, { minor => 1} );
-    } else {
-        my $votesFile = getVotesFile($web, $topic, $id, $isGlobal);
+        my ( $vw, $vt ) = Foswiki::Func::normalizeWebTopicName( $web, $1 );
+        if ( Foswiki::Func::topicExists( $vw, $vt ) ) {
+            ( $meta, $text ) = Foswiki::Func::readTopic( $vw, $vt );
+        }
+        $text .= $voteData;
+        Foswiki::Func::saveTopic( $vw, $vt, $meta, $text, { minor => 1 } );
+    }
+    else {
+        my $votesFile = getVotesFile( $web, $topic, $id, $isGlobal );
+
         # open and lock the votes
-        open(VOTES, ">>$votesFile") || die "cannot append $votesFile";
-        flock(VOTES, LOCK_EX); # wait for exclusive rights
-        seek(VOTES, 0, 2); # seek EOF in case someone else appended
-        # stuff while we were waiting
+        open( VOTES, ">>$votesFile" ) || die "cannot append $votesFile";
+        flock( VOTES, LOCK_EX );    # wait for exclusive rights
+        seek( VOTES, 0, 2 );        # seek EOF in case someone else appended
+                                    # stuff while we were waiting
         print VOTES $voteData;
+
         # unlock and close
-        flock(VOTES, LOCK_UN);
+        flock( VOTES, LOCK_UN );
         close VOTES;
     }
@@ -422 +484 @@
 
 sub clearVotesData {
-    my ($web, $topic, $id, $isGlobal, $saveto) = @_;
+    my ( $web, $topic, $id, $isGlobal, $saveto ) = @_;
     if ($saveto) {
         my $text = '';
-        my $meta = '';
+        my $meta = '';
         $saveto =~ /(.*)/;
-        my ($vw, $vt) = TWiki::Func::normalizeWebTopicName($web, $1);
-        if (TWiki::Func::topicExists($vw, $vt)) {
-            ( $meta, $text ) = TWiki::Func::readTopic( $vw, $vt );
+        my ( $vw, $vt ) = Foswiki::Func::normalizeWebTopicName( $web, $1 );
+        if ( Foswiki::Func::topicExists( $vw, $vt ) ) {
+            ( $meta, $text ) = Foswiki::Func::readTopic( $vw, $vt );
         }
         $text =~ s/(^|\n)((\|.*\||\s+)\n+)*$/$1/s;
-        TWiki::Func::saveTopicText($vw, $vt, $meta, $text, { minor => 1} );
-    } else {
-        my $votesFile = getVotesFile($web, $topic, $id, $isGlobal);
+        Foswiki::Func::saveTopicText( $vw, $vt, $meta, $text, { minor => 1 } );
+    }
+    else {
+        my $votesFile = getVotesFile( $web, $topic, $id, $isGlobal );
         unlink($votesFile) || die "cannot remove $votesFile: $!";
     }
@@ -440 +503 @@
 
 sub getVoteData {
-    my ($web, $topic, $id, $isGlobal, $saveto) = @_;
+    my ( $web, $topic, $id, $isGlobal, $saveto ) = @_;
 
     my $lines = '';
     if ($saveto) {
-        my ($vw, $vt) = TWiki::Func::normalizeWebTopicName($web, $saveto);
-        if (TWiki::Func::topicExists($vw, $vt)) {
+        my ( $vw, $vt ) = Foswiki::Func::normalizeWebTopicName( $web, $saveto );
+        if ( Foswiki::Func::topicExists( $vw, $vt ) ) {
             my $meta;
-            ( $meta, $lines ) = TWiki::Func::readTopic( $vw, $vt );
-        }
-    } else {
-        my $votesFile = getVotesFile($web, $topic, $id, $isGlobal);
-        if (open(F, "<$votesFile")) {
+            ( $meta, $lines ) = Foswiki::Func::readTopic( $vw, $vt );
+        }
+    }
+    else {
+        my $votesFile = getVotesFile( $web, $topic, $id, $isGlobal );
+        if ( open( F, "<$votesFile" ) ) {
             local $/ = undef;
             $lines = <F>;
@@ -460 +524 @@
 }
 
-
 ###############################################################################
 sub getVotesFile {
-    my ($web, $topic, $id, $global) = @_;
-
-    my $path = TWiki::Func::getWorkArea('VotePlugin');
+    my ( $web, $topic, $id, $global ) = @_;
+
+    my $path    = Foswiki::Func::getWorkArea('VotePlugin');
     my $flatweb = $web;
     $flatweb =~ s/\//./g;
-    my $votesFile = $path.'/'.
-      ($global ? '' : "${flatweb}_${topic}_").
-        ($id ? "_$id" : '');
+    my $votesFile =
+        $path . '/'
+      . ( $global ? ''     : "${flatweb}_${topic}_" )
+      . ( $id     ? "_$id" : '' );
     $votesFile = normalizeFileName($votesFile);
 
-    if (! -e $votesFile) {
-        my $attachPath = TWiki::Func::getPubDir()."/$web/$topic";
-        my $oldVotesFile = "$attachPath/_Votes" . ($id?"_$id":"") . ".txt";
-
-        if (!-e $oldVotesFile ) {
-            $oldVotesFile = "$attachPath/Votes" . ($id?"_$id":"") . ".txt";
-        }
-
-        if (open(F, "<$oldVotesFile") && open(G, ">$votesFile")) {
+    if ( !-e $votesFile ) {
+        my $attachPath = Foswiki::Func::getPubDir() . "/$web/$topic";
+        my $oldVotesFile =
+          "$attachPath/_Votes" . ( $id ? "_$id" : "" ) . ".txt";
+
+        if ( !-e $oldVotesFile ) {
+            $oldVotesFile =
+              "$attachPath/Votes" . ( $id ? "_$id" : "" ) . ".txt";
+        }
+
+        if ( open( F, "<$oldVotesFile" ) && open( G, ">$votesFile" ) ) {
             local $/;
             print G <F>;
-            close(G); close(F);
+            close(G);
+            close(F);
             unlink $oldVotesFile;
         }
@@ -497 +564 @@
     my $fileName = shift;
 
-    if (defined &TWiki::Sandbox::normalizeFileName) {
-        return TWiki::Sandbox::normalizeFileName($fileName);
-    }
-
-    if (defined &TWiki::normalizeFileName) {
-        return TWiki::normalizeFileName($fileName)
-    }
-
-    TWiki::Func::writeWarning("normalizeFileName not found ... you live dangerous");
+    if ( defined &Foswiki::Sandbox::normalizeFileName ) {
+        return Foswiki::Sandbox::normalizeFileName($fileName);
+    }
+
+    if ( defined &Foswiki::normalizeFileName ) {
+        return Foswiki::normalizeFileName($fileName);
+    }
+
+    Foswiki::Func::writeWarning(
+        "normalizeFileName not found ... you live dangerous");
     return $fileName;
 }
 
-
 ###############################################################################
 sub _getLocalDate {
-    my( $sec, $min, $hour, $mday, $mon, $year) = localtime(time());
-    $year = sprintf("%.4u", $year + 1900);  # Y2K fix
-    my $date = sprintf("%.2u-%.2u-%.2u", $year, $mon, $mday);
+    my ( $sec, $min, $hour, $mday, $mon, $year ) = localtime( time() );
+    $year = sprintf( "%.4u", $year + 1900 );    # Y2K fix
+    my $date = sprintf( "%.2u-%.2u-%.2u", $year, $mon + 1, $mday );
     return $date;
 }
@@ -520 +587 @@
 ###############################################################################
 sub inlineError {
-    return '<span class="twikiAlert">Error: '.$_[0].'</span>';
+    return '<span class="foswikiAlert">Error: ' . $_[0] . '</span>';
 }
 
@@ -526 +593 @@
 sub expandFormattingTokens {
     my $text = shift;
-    $text =~ s/\$quote/\'/go;# Compatibility
+    $text =~ s/\$quote/\'/go;    # Compatibility
 
     return $text;
-    if( defined( &TWiki::Func::decodeFormatTokens )) {
-        $text = TWiki::Func::decodeFormatTokens( $text );
-    } else {
+    if ( defined(&Foswiki::Func::decodeFormatTokens) ) {
+        $text = Foswiki::Func::decodeFormatTokens($text);
+    }
+    else {
         $text =~ s/\$n\(\)/\n/gs;
         $text =~ s/\$n\b/\n$1/gs;
@@ -545 +613 @@
 ###############################################################################
 sub getIdent {
-    my ($isSecret, $isOpen) = @_;
-
-    my $user = TWiki::Func::getWikiUserName();
+    my ( $isSecret, $isOpen ) = @_;
+
+    my $user = Foswiki::Func::getWikiUserName();
 
     my $ident;
@@ -553 +621 @@
     if ($isOpen) {
         my $date = _getLocalDate();
-        $ident = ($ENV{REMOTE_ADDR}||'').",$user,$date";
-    } else {
+        $ident = ( $ENV{REMOTE_ADDR} || '' ) . ",$user,$date";
+    }
+    else {
         $ident = $user;
     }
@@ -560 +629 @@
     if ($isSecret) {
         return md5_base64($ident);
-    } else {
+    }
+    else {
         return $ident;
     }
@@ -567 +637 @@
 ###############################################################################
 sub showSelect {
-    my ($id, $prompt, $submit, $select, $keyValueFreq, $totalVotes, $params) = @_;
-
-    my $key = $prompt->{name};
+    my ( $id, $prompt, $submit, $select, $keyValueFreq, $totalVotes, $params ) =
+      @_;
+
+    my $key   = $prompt->{name};
     my $totty = $totalVotes || 0;
-    my $row = $prompt->{format};
+    my $row   = $prompt->{format};
     $row =~ s/\$key/$key/g;
     $row =~ s/\$prompt/$select/g;
     $row =~ s/\$sum/$totty/;
     my $bars = '';
-    foreach my $value (sort {$keyValueFreq->{$b} <=>
-                               $keyValueFreq->{$a}}
-                         keys %{$keyValueFreq}) {
+    foreach my $value (
+        sort { $keyValueFreq->{$b} <=> $keyValueFreq->{$a} }
+        keys %{$keyValueFreq}
+      )
+    {
         my $score = $keyValueFreq->{$value} || 0;
 
-        my $perc = $totty ? int(1000 * $score / $totty) / 10 : 0;
-        my $bar = expandFormattingTokens($prompt->{chart});
+        my $perc = $totty ? int( 1000 * $score / $totty ) / 10 : 0;
+        my $bar = expandFormattingTokens( $prompt->{chart} );
         $bar =~ s/\$option/$value/;
         $bar =~ s/\$perc/$perc/g;
@@ -594 +667 @@
 
 sub _makeBar {
-    my ($width, $perc, $params) = @_;
+    my ( $width, $perc, $params ) = @_;
     $width = $width || $params->{width} || 300;
     my $graph = CGI::img(
-        { src=>$pubUrlPath.'/leftbar.gif',
-          alt=>'leftbar',
-          height=>14});
+        {
+            src    => $pubUrlPath . '/leftbar.gif',
+            alt    => 'leftbar',
+            height => 14
+        }
+    );
     $graph .= CGI::img(
-        { src => $pubUrlPath.'/mainbar.gif',
-          alt => 'mainbar',
-          height => 14,
-          width => $width / 100 * $perc });
+        {
+            src    => $pubUrlPath . '/mainbar.gif',
+            alt    => 'mainbar',
+            height => 14,
+            width  => $width / 100 * $perc
+        }
+    );
     $graph .= CGI::img(
-        { src=>$pubUrlPath.'/rightbar.gif',
-          alt => 'rightbar',
-          #width => $width - $width / 100 * $perc,
-          height => 14});
+        {
+            src => $pubUrlPath . '/rightbar.gif',
+            alt => 'rightbar',
+
+            #width => $width - $width / 100 * $perc,
+            height => 14
+        }
+    );
     return $graph;
 }
@@ -615 +698 @@
 ###############################################################################
 sub showLineOfStars {
-    my ($form, $prompt, $submit, $needSubmit, $act,
-        $mean, $myLast, $total) = @_;
+    my ( $form, $prompt, $submit, $needSubmit, $act, $mean, $myLast, $total ) =
+      @_;
     my $max = $prompt->{width};
-    my $perc = $total ? int(1000 * $mean / $total) / 10 : 0;
-
-    $mean = sprintf("%.3g", $mean);
-    my $row = expandFormattingTokens($prompt->{format});
+    my $perc = $total ? int( 1000 * $mean / $total ) / 10 : 0;
+
+    $mean = sprintf( "%.3g", $mean );
+    my $row = expandFormattingTokens( $prompt->{format} );
     $row =~ s/\$key/$prompt->{name}/g;
     $row =~ s/\$sum/$total/g;
@@ -627 +710 @@
     $row =~ s/\$perc/$perc/g;
     $row =~ s/\$mylast/$myLast/g;
-    require TWiki::Contrib::RatingContrib;
+    require Foswiki::Contrib::RatingContrib;
     my $eAttrs = {};
-    if ($submit && !$needSubmit) {
-        $eAttrs = {
-            onChange =>
+
+    if ( $submit && !$needSubmit ) {
+        $eAttrs = { onChange =>
               "javascript: document.getElementById('$form').submit()" };
     }
-    my $ul = TWiki::Contrib::RatingContrib::renderRating(
-        'vote_data_'.$prompt->{name}, $max, ($row =~ /\$small/) ? 1 : 0,
-        $mean, $eAttrs);
+    my $ul = Foswiki::Contrib::RatingContrib::renderRating(
+        'vote_data_' . $prompt->{name},
+        $max, ( $row =~ /\$small/ ) ? 1 : 0,
+        $mean, $eAttrs
+    );
 
     $row =~ s/\$(small|large)/$ul/g;
@@ -644 +729 @@
 
 sub isTrue {
-    my( $value, $default ) = @_;
+    my ( $value, $default ) = @_;
 
     $default ||= 0;
 
-    return $default unless defined( $value );
+    return $default unless defined($value);
 
     $value =~ s/^\s*(.*?)\s*$/$1/gi;
@@ -654 +739 @@
     $value =~ s/no//gi;
     $value =~ s/false//gi;
-    return ( $value ) ? 1 : 0;
+    return ($value) ? 1 : 0;
 }
 

trunk/VotePlugin/lib/Foswiki/Plugins/VotePlugin/DEPENDENCIES

@@ -1 @@
-TWiki::Contrib::RatingContrib,>=0,perl,Lines-of-stars rating module
+Foswiki::Contrib::RatingContrib,>=0,perl,Lines-of-stars rating module

trunk/VotePlugin/lib/Foswiki/Plugins/VotePlugin/MANIFEST

@@ -1 @@
-data/TWiki/VotePlugin.txt 0644
-data/TWiki/VarVOTE.txt 0644
-lib/TWiki/Plugins/VotePlugin/Core.pm 0644
-lib/TWiki/Plugins/VotePlugin.pm 0644
-pub/TWiki/VotePlugin/leftbar.gif 0644
-pub/TWiki/VotePlugin/mainbar.gif 0644
-pub/TWiki/VotePlugin/rightbar.gif 0644
-pub/TWiki/VotePlugin/example_stars.gif 0644
-pub/TWiki/VotePlugin/example_select.gif 0644
+data/System/VotePlugin.txt 0644
+data/System/VarVOTE.txt 0644
+lib/Foswiki/Plugins/VotePlugin/Core.pm 0644
+lib/Foswiki/Plugins/VotePlugin.pm 0644
+pub/System/VotePlugin/leftbar.gif 0644
+pub/System/VotePlugin/mainbar.gif 0644
+pub/System/VotePlugin/rightbar.gif 0644
+pub/System/VotePlugin/example_stars.gif 0644
+pub/System/VotePlugin/example_select.gif 0644

trunk/VotePlugin/lib/Foswiki/Plugins/VotePlugin/build.pl

@@ -9 +9 @@
 }
 
-use TWiki::Contrib::Build;
+use Foswiki::Contrib::Build;
 
 # Create the build object
-$build = new TWiki::Contrib::Build( 'VotePlugin' );
+$build = new Foswiki::Contrib::Build( 'VotePlugin' );
 
 # Build the target on the command line, or the default target