vmm
changeset 115 21f264a88ab2
parent 113 e35755191ff3
child 133 2d5c4745efec
--- a/vmm	Tue Aug 18 02:29:15 2009 +0000
+++ b/vmm	Tue Aug 18 03:00:00 2009 +0000
@@ -85,6 +85,10 @@
 
 def _getOrder():
     order = ()
+    if vmm.cfgGetInt('misc', 'dovecotvers') > 11:
+        sieve_name = 'sieve'
+    else:
+        sieve_name = 'managesieve'
     if argv[1] in ['di', 'domaininfo']:
         order = (('domainname', 0), ('gid', 1), ('transport', 0),
                 ('domaindir', 0), ('aliasdomains', 0), ('accounts', 0),
@@ -94,11 +98,11 @@
         or vmm.cfgGetBoolean('maildir', 'diskusage'):
             order = (('address', 0), ('name', 0), ('uid', 1), ('gid', 1),
                     ('transport', 0), ('maildir', 0), ('disk usage', 0),
-                    ('smtp', 1), ('pop3', 1), ('imap', 1), ('sieve', 1))
+                    ('smtp', 1), ('pop3', 1), ('imap', 1), (sieve_name, 1))
         else:
             order = (('address', 0), ('name', 0), ('uid', 1), ('gid', 1),
                     ('transport', 0), ('maildir', 0), ('smtp', 1), ('pop3', 1),
-                    ('imap', 1), ('sieve', 1))
+                    ('imap', 1), (sieve_name, 1))
     elif argv[1] in ['gu', 'getuser']:
         order = (('uid', 1), ('gid', 1), ('address', 0))
     return order