|
From: <de...@de...> - 2011-04-23 09:41:22
|
Author: PeterThoeny Date: 2011-04-23 04:41:16 -0500 (Sat, 23 Apr 2011) New Revision: 21075 Trac url: http://develop.twiki.org/trac/changeset/21075 Modified: twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsByUser.txt twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsOverview.txt twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsPlugin.txt twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/lib/TWiki/Plugins/UsageStatisticsPlugin/Core.pm Log: Item6686: Initial version of UsageStatisticsPlugin - adding reverse="on" feature for month list to list newest months first in picklist Modified: twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsByUser.txt =================================================================== --- twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsByUser.txt 2011-04-23 09:40:11 UTC (rev 21074) +++ twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsByUser.txt 2011-04-23 09:41:16 UTC (rev 21075) @@ -1,9 +1,9 @@ -%META:TOPICINFO{author="TWikiContributor" date="1303545237" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1303551266" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="UsageStatisticsPlugin"}% ---+ Usage Statistics: By User <form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%"> -| User: <select name="user"> <option>%URLPARAM{user}%</option> <option></option> %SEARCH{ "META:FORM.*[U]serForm;!META:FIELD.name=\"AccountStatus.*value.*Inactive" type="regex" nonoise="on" excludetopic="NewUserTemplate" web="%USERSWEB%" format="<option>$topic</option>" separator=" " }% </select> | | for month: <select name="month"> <option>%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%</option> <option></option> %USAGESTATISTICS{ action="monthlist" format="<option>$month</option>" separator=" " }% </select> | <input type="submit" value="Show statistics" class="twikiSubmit" > | [[UsageStatisticsOverview][Overview]] | +| User: <select name="user"> <option>%URLPARAM{user}%</option> <option></option> %SEARCH{ "META:FORM.*[U]serForm;!META:FIELD.name=\"AccountStatus.*value.*Inactive" type="regex" nonoise="on" excludetopic="NewUserTemplate" web="%USERSWEB%" format="<option>$topic</option>" separator=" " }% </select> | | for month: <select name="month"> <option>%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%</option> <option></option> %USAGESTATISTICS{ action="monthlist" reverse="on" format="<option>$month</option>" separator=" " }% </select> | <input type="submit" value="Show statistics" class="twikiSubmit" > | [[UsageStatisticsOverview][Overview]] | </form> %USAGESTATISTICS{ action="user" month="%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%" user="%URLPARAM{user}%" }% Modified: twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsOverview.txt =================================================================== --- twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsOverview.txt 2011-04-23 09:40:11 UTC (rev 21074) +++ twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsOverview.txt 2011-04-23 09:41:16 UTC (rev 21075) @@ -1,9 +1,9 @@ -%META:TOPICINFO{author="TWikiContributor" date="1303545241" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1303551266" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="UsageStatisticsPlugin"}% ---+ Usage Statistics: Overview <form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%"> -| Month: <select name="month"> <option>%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%</option> <option></option> %USAGESTATISTICS{ action="monthlist" format="<option>$month</option>" separator=" " }% </select> | | <input type="submit" value="Show statistics" class="twikiSubmit" > | [[UsageStatisticsByUser][User statistics]] | +| Month: <select name="month"> <option>%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%</option> <option></option> %USAGESTATISTICS{ action="monthlist" reverse="on" format="<option>$month</option>" separator=" " }% </select> | | <input type="submit" value="Show statistics" class="twikiSubmit" > | [[UsageStatisticsByUser][User statistics]] | </form> %USAGESTATISTICS{ action="overview" month="%URLPARAM{ "month" default="%SERVERTIME{$year-$mo}%" }%" }% Modified: twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsPlugin.txt =================================================================== --- twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsPlugin.txt 2011-04-23 09:40:11 UTC (rev 21074) +++ twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/data/TWiki/UsageStatisticsPlugin.txt 2011-04-23 09:41:16 UTC (rev 21075) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1303333506" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1303551266" format="1.1" version="$Rev$"}% ---+!! !UsageStatisticsPlugin <!-- Contributions to this plugin are appreciated. Please update the plugin page at @@ -49,6 +49,7 @@ | *Parameter* | *Description* | *Default* | | =action="monthlist"= | Get list of months that have statistics logs | none | +| =reverse="on"= | Reverse the list, e.g. newest months first. | ="off"= | | =format="..."= | Format for each month. =$month= expands to the month, format =YYYY-MM= | ="$month"= | | =separator="..."= | Separator between months. | ="$n"= (newline) | Modified: twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/lib/TWiki/Plugins/UsageStatisticsPlugin/Core.pm =================================================================== --- twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/lib/TWiki/Plugins/UsageStatisticsPlugin/Core.pm 2011-04-23 09:40:11 UTC (rev 21074) +++ twiki/branches/TWikiRelease05x00/UsageStatisticsPlugin/lib/TWiki/Plugins/UsageStatisticsPlugin/Core.pm 2011-04-23 09:41:16 UTC (rev 21075) @@ -227,6 +227,7 @@ my $format = $params->{format} || '$month'; my $separator = $params->{separator} || '$n'; + my $reverse = $params->{'reverse'} || '0'; my $dir = $TWiki::cfg{LogFileName} || "$TWiki::cfg{DataDir}/log%DATE%.txt"; $dir =~ s/\/[^\/]*$//; # remove file to get just the path @@ -247,6 +248,8 @@ readdir( DIR ); closedir( DIR ); + @logMonths = reverse( @logMonths ) if( $reverse && $reverse !~ /^off$/i ); + $separator =~ s/\$n/\n/go; my $text = ''; $text = join( $separator, @logMonths ) if( @logMonths ); |