vmm
branchv0.6.x
changeset 166 b152ad5c7071
parent 162 0ac9ef587769
child 168 fd496561acc6
equal deleted inserted replaced
165:7e50e4c49ed7 166:b152ad5c7071
    75             VMME.VMMConfigException), e:
    75             VMME.VMMConfigException), e:
    76         w_err(e.code(), _(u'Error: %s\n') % e.msg())
    76         w_err(e.code(), _(u'Error: %s\n') % e.msg())
    77 
    77 
    78 def _getOrder():
    78 def _getOrder():
    79     order = ()
    79     order = ()
    80     if vmm.cfgGetInt('misc', 'dovecotvers') > 11:
    80     if vmm.cfgGetInt('misc', 'dovecot_vers') > 11:
    81         sieve_name = u'sieve'
    81         sieve_name = u'sieve'
    82     else:
    82     else:
    83         sieve_name = u'managesieve'
    83         sieve_name = u'managesieve'
    84     if argv[1] in (u'di', u'domaininfo'):
    84     if argv[1] in (u'di', u'domaininfo'):
    85         order = ((u'domainname', 0), (u'gid', 1), (u'transport', 0),
    85         order = ((u'domainname', 0), (u'gid', 1), (u'transport', 0),
    86                 (u'domaindir', 0), (u'aliasdomains', 0), (u'accounts', 0),
    86                 (u'domaindir', 0), (u'aliasdomains', 0), (u'accounts', 0),
    87                 (u'aliases', 0), (u'relocated', 0))
    87                 (u'aliases', 0), (u'relocated', 0))
    88     elif argv[1] in (u'ui', u'userinfo'):
    88     elif argv[1] in (u'ui', u'userinfo'):
    89         if argc == 4 and argv[3] != u'aliases'\
    89         if argc == 4 and argv[3] != u'aliases'\
    90         or vmm.cfgGetBoolean('maildir', 'diskusage'):
    90         or vmm.cfgGetBoolean('account', 'disk_usage'):
    91             order = ((u'address', 0), (u'name', 0), (u'uid', 1), (u'gid', 1),
    91             order = ((u'address', 0), (u'name', 0), (u'uid', 1), (u'gid', 1),
    92                     (u'transport', 0), (u'maildir', 0), (u'disk usage', 0),
    92                     (u'transport', 0), (u'maildir', 0), (u'disk usage', 0),
    93                     (u'smtp', 1), (u'pop3', 1), (u'imap', 1), (sieve_name, 1))
    93                     (u'smtp', 1), (u'pop3', 1), (u'imap', 1), (sieve_name, 1))
    94         else:
    94         else:
    95             order = ((u'address', 0), (u'name', 0), (u'uid', 1), (u'gid', 1),
    95             order = ((u'address', 0), (u'name', 0), (u'uid', 1), (u'gid', 1),