beenull/mail-hosting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add more cleanups

Browse source
This commit is contained in:
Daniel Winzen 2024-02-23 20:42:02 +01:00
parent 8d54b307ca
commit 3f6cfe7c14
No known key found for this signature in database
GPG key ID: 222FCC3F35C41077
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cron.php
View file

@ -32,6 +32,10 @@ while ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
if ( file_exists( $mail_files ) ) { if ( file_exists( $mail_files ) ) {
exec( 'rm -r ' . escapeshellarg( $mail_files ) ); exec( 'rm -r ' . escapeshellarg( $mail_files ) );
} }
$snapmail_files = '/var/local/snappymail/_data_/_default_/storage/' . $domain_basename . '/' . $local_basename;
if ( file_exists( $snapmail_files ) ) {
exec( 'rm -r ' . escapeshellarg( $snapmail_files ) );
}
$files = glob( '/var/local/squirrelmail/data/' . $local_basename . '@' . $domain_basename . '.{pref,abook,sig}', GLOB_BRACE ); $files = glob( '/var/local/squirrelmail/data/' . $local_basename . '@' . $domain_basename . '.{pref,abook,sig}', GLOB_BRACE );
if ( $tmp[ 'domain' ] === 'danwin1210.de' ) { if ( $tmp[ 'domain' ] === 'danwin1210.de' ) {
$files = array_merge( $files, glob( '/var/local/squirrelmail/data/' . $local_basename . '{@danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion,}.{pref,abook,sig}', GLOB_BRACE ) ); $files = array_merge( $files, glob( '/var/local/squirrelmail/data/' . $local_basename . '{@danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion,}.{pref,abook,sig}', GLOB_BRACE ) );
@ -66,6 +70,10 @@ while ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
if ( file_exists( $mail_files ) ) { if ( file_exists( $mail_files ) ) {
exec( 'rm -r ' . escapeshellarg( $mail_files ) ); exec( 'rm -r ' . escapeshellarg( $mail_files ) );
} }
$snapmail_files = '/var/local/snappymail/_data_/_default_/storage/' . $domain_basename . '/';
if ( file_exists( $snapmail_files ) ) {
exec( 'rm -r ' . escapeshellarg( $snapmail_files ) );
}
if ( is_array( $files ) ) { if ( is_array( $files ) ) {
foreach ( $files as $file ) { foreach ( $files as $file ) {
@unlink( $file ); @unlink( $file );

33
tools/delete_leftover_files.php
View file

@ -25,3 +25,36 @@ foreach ( $domains as $domain ) {
} }
} }
} }
$domains = array_diff( scandir( '/var/local/snappymail/_data_/_default_/storage/' ), array( '..', '.', '__nobody__' ) );
$dirs = [];
foreach ( $domains as $domain ) {
if ( is_dir( '/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) ) ) {
if ( ! isset( $mailboxes[ $domain ] ) ) {
echo sprintf(_('%s does not seem to have any accounts, but has a snappymail directory. Consider deleting it.'), $domain).PHP_EOL;
} else {
$accounts = array_diff( scandir( '/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) ), array( '..', '.' ) );
foreach ( $accounts as $account ) {
if ( ! isset( $mailboxes[ $domain ][ $account ] ) && is_dir( '/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) . '/' . basename( $account ) ) ) {
exec( 'rm -r ' . escapeshellarg('/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) . '/' . basename( $account )));
echo sprintf(_('Deleted: %s'), '/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) . '/' . basename( $account )) . PHP_EOL;
} elseif( is_file('/var/local/snappymail/_data_/_default_/storage/' . basename( $domain ) . '/' . basename( $account ))){
echo sprintf(_('File found in mail directory location: "%s". Consider deleting it.'), '/var/local/snappymail/_data_/_default_/storage/'. basename( $domain ) . '/' . basename( $account ) ) . PHP_EOL;
}
}
}
}
}
$accout_files = array_diff( scandir( '/var/local/squirrelmail/data/' ), array( '..', '.' ) );
foreach( $accout_files as $file ){
if(preg_match( '/^(.+?)(@(.+))?\.(pref|abook|sig)$/', $file, $matches )){
$domain = $matches[ 3 ];
if(in_array($domain, ['', 'danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion'], true)){
$domain = 'danwin1210.de';
}
$account = $matches[ 1 ];
if ( ! isset( $mailboxes[ $domain ][ $account ] )){
unlink('/var/local/squirrelmail/data/' . $file);
echo sprintf(_('Deleted: %s'), '/var/local/squirrelmail/data/' . $file) . PHP_EOL;
}
}
}