# HG changeset patch # User Pascal Volk # Date 1219422315 0 # Node ID 1fc1f82c662f13eb879a88e03a90a5f213805ef2 # Parent 5b50eb306d37bdb5b526945b0f06b0931d09421b * 'VirtualMailManager/VirtualMailManager.py' - Renamed wrapper methods from »object_action« to »objectAction« * 'vmm' - Accommodated method calls to new method names diff -r 5b50eb306d37 -r 1fc1f82c662f VirtualMailManager/VirtualMailManager.py --- a/VirtualMailManager/VirtualMailManager.py Fri Aug 22 03:07:53 2008 +0000 +++ b/VirtualMailManager/VirtualMailManager.py Fri Aug 22 16:25:15 2008 +0000 @@ -262,7 +262,7 @@ os.makedirs(directory, mode) os.chown(directory, uid, gid) - def __domdirmake(self, domdir, gid): + def __domDirMake(self, domdir, gid): os.umask(0006) oldpwd = os.getcwd() basedir = self.__Cfg.get('domdir', 'base') @@ -278,7 +278,7 @@ gid) os.chdir(oldpwd) - def __maildirmake(self, domdir, uid, gid): + def __mailDirMake(self, domdir, uid, gid): """Creates maildirs and maildir subfolders. Keyword arguments: @@ -303,7 +303,7 @@ self.__makedir(folder+'/'+subdir, mode, uid, gid) os.chdir(oldpwd) - def __userdirdelete(self, domdir, uid, gid): + def __userDirDelete(self, domdir, uid, gid): if uid > 0 and gid > 0: userdir = '%s' % uid if userdir.count('..') or domdir.count('..'): @@ -322,7 +322,7 @@ raise VMMException(_(u"No such directory: %s") % domdir+'/'+userdir, ERR.NO_SUCH_DIRECTORY) - def __domdirdelete(self, domdir, gid): + def __domDirDelete(self, domdir, gid): if gid > 0: if not self.__isdir(domdir): return @@ -446,12 +446,12 @@ raise VMMException(_(u"Invalid section: '%s'") % section, ERR.INVALID_SECTION) - def domain_add(self, domainname, transport=None): + def domainAdd(self, domainname, transport=None): dom = self.__getDomain(domainname, transport) dom.save() - self.__domdirmake(dom.getDir(), dom.getID()) + self.__domDirMake(dom.getDir(), dom.getID()) - def domain_transport(self, domainname, transport, force=None): + def domainTransport(self, domainname, transport, force=None): if force is not None and force != 'force': raise VMMDomainException(_(u"Invalid argument: '%s'") % force, ERR.INVALID_OPTION) @@ -461,7 +461,7 @@ else: dom.updateTransport(transport, force=True) - def domain_delete(self, domainname, force=None): + def domainDelete(self, domainname, force=None): if not force is None and force not in ['deluser','delalias','delall']: raise VMMDomainException(_(u"Invalid argument: »%s«") % force, ERR.INVALID_OPTION) @@ -477,9 +477,9 @@ else: dom.delete() if self.__Cfg.getboolean('domdir', 'delete'): - self.__domdirdelete(domdir, gid) + self.__domDirDelete(domdir, gid) - def domain_info(self, domainname, detailed=None): + def domainInfo(self, domainname, detailed=None): dom = self.__getDomain(domainname) dominfo = dom.getInfo() if dominfo['domainname'].startswith('xn--'): @@ -496,7 +496,7 @@ raise VMMDomainException(_(u'Invalid argument: »%s«') % detailed, ERR.INVALID_OPTION) - def domain_alias_add(self, aliasname, domainname): + def domainAliasAdd(self, aliasname, domainname): """Adds an alias name to the domain. Keyword arguments: @@ -507,12 +507,12 @@ domAlias = DomainAlias(self.__dbh, aliasname, dom) domAlias.save() - def domain_alias_info(self, aliasname): + def domainAliasInfo(self, aliasname): self.__dbConnect() domAlias = DomainAlias(self.__dbh, aliasname, None) return domAlias.info() - def domain_alias_delete(self, aliasname): + def domainAliasDelete(self, aliasname): """Deletes the specified alias name. Keyword arguments: @@ -522,7 +522,7 @@ domAlias = DomainAlias(self.__dbh, aliasname, None) domAlias.delete() - def domain_list(self, pattern=None): + def domainList(self, pattern=None): from Domain import search like = False if pattern is not None: @@ -542,7 +542,7 @@ self.__dbConnect() return search(self.__dbh, pattern=pattern, like=like) - def user_add(self, emailaddress, password): + def userAdd(self, emailaddress, password): acc = self.__getAccount(emailaddress, password) if password is None: password = self._readpass() @@ -552,20 +552,20 @@ self.__Cfg.getboolean('services', 'pop3'), self.__Cfg.getboolean('services', 'imap'), self.__Cfg.getboolean('services', 'managesieve')) - self.__maildirmake(acc.getDir('domain'), acc.getUID(), acc.getGID()) + self.__mailDirMake(acc.getDir('domain'), acc.getUID(), acc.getGID()) - def alias_add(self, aliasaddress, targetaddress): + def aliasAdd(self, aliasaddress, targetaddress): alias = self.__getAlias(aliasaddress, targetaddress) alias.save() - def user_delete(self, emailaddress): + def userDelete(self, emailaddress): acc = self.__getAccount(emailaddress) uid = acc.getUID() gid = acc.getGID() acc.delete() if self.__Cfg.getboolean('maildir', 'delete'): try: - self.__userdirdelete(acc.getDir('domain'), uid, gid) + self.__userDirDelete(acc.getDir('domain'), uid, gid) except VMMException, e: if e.code() in [ERR.FOUND_DOTS_IN_PATH, ERR.MAILDIR_PERM_MISMATCH, ERR.NO_SUCH_DIRECTORY]: @@ -578,27 +578,27 @@ else: raise e - def alias_info(self, aliasaddress): + def aliasInfo(self, aliasaddress): alias = self.__getAlias(aliasaddress) return alias.getInfo() - def alias_delete(self, aliasaddress, targetaddress=None): + def aliasDelete(self, aliasaddress, targetaddress=None): alias = self.__getAlias(aliasaddress, targetaddress) alias.delete() - def user_info(self, emailaddress, diskusage=False): + def userInfo(self, emailaddress, diskusage=False): acc = self.__getAccount(emailaddress) info = acc.getInfo() if self.__Cfg.getboolean('maildir', 'diskusage') or diskusage: info['disk usage'] = self.__getDiskUsage('%(maildir)s' % info) return info - def user_byID(self, uid): + def userByID(self, uid): from Account import getAccountByID self.__dbConnect() return getAccountByID(uid, self.__dbh) - def user_password(self, emailaddress, password): + def userPassword(self, emailaddress, password): acc = self.__getAccount(emailaddress) if acc.getUID() == 0: raise VMMException(_(u"Account doesn't exists"), @@ -607,19 +607,19 @@ password = self._readpass() acc.modify('password', self.__pwhash(password)) - def user_name(self, emailaddress, name): + def userName(self, emailaddress, name): acc = self.__getAccount(emailaddress) acc.modify('name', name) - def user_transport(self, emailaddress, transport): + def userTransport(self, emailaddress, transport): acc = self.__getAccount(emailaddress) acc.modify('transport', transport) - def user_disable(self, emailaddress, service=None): + def userDisable(self, emailaddress, service=None): acc = self.__getAccount(emailaddress) acc.disable(service) - def user_enable(self, emailaddress, service=None): + def userEnable(self, emailaddress, service=None): acc = self.__getAccount(emailaddress) acc.enable(service) diff -r 5b50eb306d37 -r 1fc1f82c662f vmm --- a/vmm Fri Aug 22 03:07:53 2008 +0000 +++ b/vmm Fri Aug 22 16:25:15 2008 +0000 @@ -177,25 +177,25 @@ if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing domain name.')) elif argc < 4: - vmm.domain_add(argv[2].lower()) + vmm.domainAdd(argv[2].lower()) else: - vmm.domain_add(argv[2].lower(), argv[3]) + vmm.domainAdd(argv[2].lower(), argv[3]) def domain_delete(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing domain name.')) elif argc < 4: - vmm.domain_delete(argv[2].lower()) + vmm.domainDelete(argv[2].lower()) else: - vmm.domain_delete(argv[2].lower(), argv[3]) + vmm.domainDelete(argv[2].lower(), argv[3]) def domain_info(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing domain name.')) elif argc < 4: - _printInfo(vmm.domain_info(argv[2].lower()), _('Domain')) + _printInfo(vmm.domainInfo(argv[2].lower()), _('Domain')) else: - infos = vmm.domain_info(argv[2].lower(), argv[3]) + infos = vmm.domainInfo(argv[2].lower(), argv[3]) _printInfo(infos[0], _('Domain')) _printList(infos[1], _('alias domains')) _printList(infos[2], _('accounts')) @@ -207,9 +207,9 @@ if argc < 4: usage(EXIT.MISSING_ARGS, _(u'Missing new transport.')) elif argc < 5: - vmm.domain_transport(argv[2].lower(), argv[3]) + vmm.domainTransport(argv[2].lower(), argv[3]) else: - vmm.domain_transport(argv[2].lower(), argv[3], argv[4]) + vmm.domainTransport(argv[2].lower(), argv[3], argv[4]) def domain_alias_add(): if argc < 3: @@ -218,20 +218,20 @@ elif argc < 4: usage(EXIT.MISSING_ARGS, _(u'Missing target domain name.')) else: - vmm.domain_alias_add(argv[2].lower(), argv[3].lower()) + vmm.domainAliasAdd(argv[2].lower(), argv[3].lower()) def domain_alias_info(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing alias domain name.')) else: - info = vmm.domain_alias_info(argv[2].lower()) + info = vmm.domainAliasInfo(argv[2].lower()) w_std(info+'\n') def domain_alias_delete(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing alias domain name.')) else: - vmm.domain_alias_delete(argv[2].lower()) + vmm.domainAliasDelete(argv[2].lower()) def user_add(): if argc < 3: @@ -240,21 +240,21 @@ password = None else: password = argv[3] - vmm.user_add(argv[2].lower(), password) + vmm.userAdd(argv[2].lower(), password) def user_delete(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing e-mail address.')) else: - vmm.user_delete(argv[2].lower()) + vmm.userDelete(argv[2].lower()) def user_info(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing e-mail address.')) elif argc < 4: - _printInfo(vmm.user_info(argv[2].lower()), 'Account') + _printInfo(vmm.userInfo(argv[2].lower()), 'Account') else: - _printInfo(vmm.user_info(argv[2].lower(), True), 'Account') + _printInfo(vmm.userInfo(argv[2].lower(), True), 'Account') def user_name(): if argc < 3: @@ -262,7 +262,7 @@ if argc < 4: usage(EXIT.MISSING_ARGS, _('Missing users name.')) else: - vmm.user_name(argv[2].lower(), argv[3]) + vmm.userName(argv[2].lower(), argv[3]) def user_transport(): if argc < 3: @@ -270,23 +270,23 @@ if argc <4: usage(EXIT.MISSING_ARGS, _(u'Missing transport.')) else: - vmm.user_transport(argv[2].lower(), argv[3]) + vmm.userTransport(argv[2].lower(), argv[3]) def user_enable(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing e-mail address.')) elif argc < 4: - vmm.user_enable(argv[2].lower()) + vmm.userEnable(argv[2].lower()) else: - vmm.user_enable(argv[2].lower(), argv[3].lower()) + vmm.userEnable(argv[2].lower(), argv[3].lower()) def user_disable(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing e-mail address.')) elif argc < 4: - vmm.user_disable(argv[2].lower()) + vmm.userDisable(argv[2].lower()) else: - vmm.user_disable(argv[2].lower(), argv[3].lower()) + vmm.userDisable(argv[2].lower(), argv[3].lower()) def user_password(): if argc < 3: @@ -295,39 +295,39 @@ password = None else: password = argv[3] - vmm.user_password(argv[2].lower(), password) + vmm.userPassword(argv[2].lower(), password) def alias_add(): if argc < 4: usage(EXIT.MISSING_ARGS, _(u'Missing alias address and destination.')) else: - vmm.alias_add(argv[2].lower(), argv[3]) + vmm.aliasAdd(argv[2].lower(), argv[3]) def alias_info(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing alias address')) else: - _printAliases(argv[2], vmm.alias_info(argv[2].lower())) + _printAliases(argv[2], vmm.aliasInfo(argv[2].lower())) def alias_delete(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing alias address')) elif argc < 4: - vmm.alias_delete(argv[2].lower()) + vmm.aliasDelete(argv[2].lower()) else: - vmm.alias_delete(argv[2].lower(), argv[3].lower()) + vmm.aliasDelete(argv[2].lower(), argv[3].lower()) def user_byID(): if argc < 3: usage(EXIT.MISSING_ARGS, _(u'Missing userid')) else: - _printInfo(vmm.user_byID(argv[2]), u'Account') + _printInfo(vmm.userByID(argv[2]), u'Account') def domain_list(): if argc < 3: - order, doms = vmm.domain_list() + order, doms = vmm.domainList() else: - order, doms = vmm.domain_list(argv[2].lower()) + order, doms = vmm.domainList(argv[2].lower()) _printDomList(order, doms) def show_warnings():