VirtualMailManager/VirtualMailManager.py
changeset 66 995d538a6eb5
parent 62 869de537a020
child 68 7ae95b9938c4
--- a/VirtualMailManager/VirtualMailManager.py	Mon Aug 25 14:49:43 2008 +0000
+++ b/VirtualMailManager/VirtualMailManager.py	Mon Aug 25 20:45:54 2008 +0000
@@ -571,11 +571,14 @@
         alias = self.__getAlias(aliasaddress, targetaddress)
         alias.save()
 
-    def userDelete(self, emailaddress):
+    def userDelete(self, emailaddress, force=None):
+        if force not in [None, 'delalias']:
+            raise VMMException(_(u"Invalid argument: »%s«") % force,
+                    ERR.INVALID_AGUMENT)
         acc = self.__getAccount(emailaddress)
         uid = acc.getUID()
         gid = acc.getGID()
-        acc.delete()
+        acc.delete(force)
         if self.__Cfg.getboolean('maildir', 'delete'):
             try:
                 self.__userDirDelete(acc.getDir('domain'), uid, gid)