1 |
--- 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 |
3 |
@@ -272,7 +272,7 @@ |
4 |
use Pod::Usage; |
5 |
use POSIX qw/strftime floor/; |
6 |
use Time::Local; |
7 |
-use Date::Manip; |
8 |
+use Date::Parse; |
9 |
use Time::TAI64; |
10 |
use esmith::ConfigDB; |
11 |
use esmith::DomainsDB; |
12 |
@@ -305,8 +306,6 @@ |
13 |
timezone => `date +%z`, |
14 |
); |
15 |
|
16 |
-Date_Init("TZ=$opt{'timezone'}"); |
17 |
- |
18 |
my $FetchmailIP = '127.0.0.200'; #Apparent Ip address of fetchmail deliveries |
19 |
my $WebmailIP = '127.0.0.1'; #Apparent Ip of Webmail sender |
20 |
my $localhost = 'localhost'; #Apparent sender for webmail |
21 |
@@ -1126,8 +1125,12 @@ |
22 |
}; |
23 |
$time = timelocal($sec,$min,$hour,$mday,$mon,$year) |
24 |
} |
25 |
- my $start = UnixDate( $startdate, "%s" ); |
26 |
- my $end = $enddate ? UnixDate( $enddate, "%s" ) : |
27 |
+ |
28 |
+ print STDOUT $startdate; |
29 |
+ print STDOUT $enddate; |
30 |
+ |
31 |
+ my $start = str2time( $startdate ); |
32 |
+ my $end = $enddate ? str2time( $enddate ) : |
33 |
$startdate ? $start + $secsininterval : $time; |
34 |
$start = $startdate ? $start : $end - $secsininterval; |
35 |
return ( $start > $end ) ? ( $end, $start ) : ( $start, $end ); |