Merge branch 'sme9' of main:/home/e-smith/files/shares/dev/files/ipasserelle-base into sme9

This commit is contained in:
Daniel Berteaud 2016-05-11 17:09:59 +02:00
commit 70c351842f
2 changed files with 7 additions and 4 deletions

View File

@ -1,4 +1,4 @@
%define version 0.2.54
%define version 0.2.55
%define release 1
%define name ipasserelle-base
@ -49,12 +49,15 @@ Based on SMEServer, iPasserelle is a specially configured
SME Server, with some additionnal modules
%changelog
* Wed Apr 13 2016 Daniel Berteaud <daniel@firewall-services.com> 0.2.54-1
* Wed Apr 13 2016 Daniel Berteaud <daniel@firewall-services.com> 0.2.55-1
- Remove S-A custom scores
- Add MailSpike BL
- Requires smeserver-expire-accounts
- Add spamassassin autolear param
* Wed Dec 23 2015 Daniel Berteaud <daniel@firewall-services.com> 0.2.54-1
- Fix home RecycleBin purge by using mtime instead of atime
* Fri Dec 4 2015 Daniel Berteaud <daniel@firewall-services.com> 0.2.53-1
- Define netfs service in the DB

View File

@ -46,8 +46,8 @@ foreach my $user ($a->get_all_by_prop(type=>'user')){
sub remove{
# Remove files with last modification older than $retention
if ( -f ){
my $atime = stat($_)->atime;
(time() - $atime > $retention) && unlink($_);
my $mtime = stat($_)->mtime;
(time() - $mtime > $retention) && unlink($_);
}
# Remove empty directories
elsif ( -d ){