kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Mail deletion

This commit is contained in:
Alan Garcia 2012-08-25 13:24:11 +00:00
parent 09e0234ee2
commit 92965e64bd
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -25,8 +25,8 @@
# Purpose of file: Makefile des binaires de /usr/lib/alternc # Purpose of file: Makefile des binaires de /usr/lib/alternc
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# #
SETUID=mail_add mail_del quota_edit quota_get mem_add mem_del du.pl SETUID=quota_edit quota_get mem_add mem_del du.pl
SCRIPTS=sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh SCRIPTS=sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh mail_deletion.sh
LIBS=functions.sh functions_hosting.sh functions_dns.sh LIBS=functions.sh functions_hosting.sh functions_dns.sh
BIN=$(DESTDIR)/usr/lib/alternc/ BIN=$(DESTDIR)/usr/lib/alternc/

17
src/mail_deletion.sh
View File

@ -31,6 +31,10 @@ elif [ -f "$LOCK_FILE" ]; then
fi fi
fi fi
# If there is ionice, add it to the command line
ionice=""
ionice > /dev/null && ionice="ionice -c 3 "
# We lock the application # We lock the application
echo $$ > "$LOCK_FILE" echo $$ > "$LOCK_FILE"
@ -44,8 +48,17 @@ mysql_query "SELECT id, quote(replace(path,'!','\\!')) FROM mailbox WHERE mail_a
echo "Error : this directory will not be deleted, pattern incorrect" echo "Error : this directory will not be deleted, pattern incorrect"
continue continue
fi fi
test -d $path && nice 10 rm -rf $path
mysql_query "DELETE FROM mailbox WHERE id=$id;" # If no dir, DELETE
# If dir and rm ok, DELETE
# Other case, do nothing
if [ -d $path ] ; then
$ionice rm -rf $path && mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';"
# Do the rm again in case of newly added file during delete. Should not be usefull
test -d $path && $ionice rm -rf $path
else
mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';"
fi
done done
# List the adresses to DELETE # List the adresses to DELETE