1 |
--- smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.reworkDateManip 2008-10-03 18:38:07.000000000 +0200 |
--- smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.reworkDateManip 2008-10-03 18:38:07.000000000 +0200 |
2 |
+++ smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl 2008-10-03 19:02:12.000000000 +0200 |
+++ smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl 2008-10-03 19:02:12.000000000 +0200 |
3 |
@@ -272,7 +272,8 @@ |
@@ -272,7 +272,7 @@ |
4 |
use Pod::Usage; |
use Pod::Usage; |
5 |
use POSIX qw/strftime floor/; |
use POSIX qw/strftime floor/; |
6 |
use Time::Local; |
use Time::Local; |
7 |
-use Date::Manip; |
-use Date::Manip; |
|
+#use Date::Manip; |
|
8 |
+use Date::Parse; |
+use Date::Parse; |
9 |
use Time::TAI64; |
use Time::TAI64; |
10 |
use esmith::ConfigDB; |
use esmith::ConfigDB; |
18 |
my $FetchmailIP = '127.0.0.200'; #Apparent Ip address of fetchmail deliveries |
my $FetchmailIP = '127.0.0.200'; #Apparent Ip address of fetchmail deliveries |
19 |
my $WebmailIP = '127.0.0.1'; #Apparent Ip of Webmail sender |
my $WebmailIP = '127.0.0.1'; #Apparent Ip of Webmail sender |
20 |
my $localhost = 'localhost'; #Apparent sender for webmail |
my $localhost = 'localhost'; #Apparent sender for webmail |
21 |
@@ -1126,8 +1125,12 @@ |
@@ -1126,8 +1125,9 @@ |
22 |
}; |
}; |
23 |
$time = timelocal($sec,$min,$hour,$mday,$mon,$year) |
$time = timelocal($sec,$min,$hour,$mday,$mon,$year) |
24 |
} |
} |
25 |
- my $start = UnixDate( $startdate, "%s" ); |
- my $start = UnixDate( $startdate, "%s" ); |
26 |
- my $end = $enddate ? UnixDate( $enddate, "%s" ) : |
- my $end = $enddate ? UnixDate( $enddate, "%s" ) : |
27 |
+ |
+ |
|
+ print STDOUT $startdate; |
|
|
+ print STDOUT $enddate; |
|
|
+ |
|
28 |
+ my $start = str2time( $startdate ); |
+ my $start = str2time( $startdate ); |
29 |
+ my $end = $enddate ? str2time( $enddate ) : |
+ my $end = $enddate ? str2time( $enddate ) : |
30 |
$startdate ? $start + $secsininterval : $time; |
$startdate ? $start + $secsininterval : $time; |