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