VirtualMailManager/handler.py
branchv0.7.x
changeset 756 139ced0fea1e
parent 753 3f1cecdcdfca
child 758 332089388204
--- a/VirtualMailManager/handler.py	Mon Jun 09 18:12:03 2014 +0000
+++ b/VirtualMailManager/handler.py	Mon Jun 09 18:47:44 2014 +0000
@@ -626,10 +626,10 @@
                 self._warnings.append(_("The destination account/alias '%s' "
                                         "does not exist.") % destination)
 
-    def user_delete(self, emailaddress, delete_home, force=False):
+    def user_delete(self, emailaddress, del_dir, force=False):
         """Wrapper around Account.delete(...)"""
-        if not isinstance(delete_home, bool):
-            raise TypeError('delete_home must be a bool')
+        if not isinstance(del_dir, bool):
+            raise TypeError('del_dir must be a bool')
         if not isinstance(force, bool):
             raise TypeError('force must be a bool')
         acc = self._get_account(emailaddress)
@@ -641,7 +641,7 @@
         dom_dir = acc.domain.directory
         acc_dir = acc.home
         acc.delete(force)
-        if delete_home or self._cfg.dget('account.delete_directory'):
+        if del_dir or self._cfg.dget('account.delete_directory'):
             try:
                 self._delete_home(dom_dir, uid, gid)
             except VMMError as err: