Kolab Groupware OBS

pykolab-0.8.1.tar.gz/kolabd/__init__.py Changed

pykolab-0.8.1.tar.gz/pykolab/imap/__init__.py Changed

@@ -536,15 +536,20 @@
                 from pykolab.auth import Auth
                 auth = Auth()
                 auth.connect()
-                domains = auth._list_domains(self.domain)
+
+                domains = auth.list_domains(self.domain)
+
                 auth.disconnect()
-                if len(domains) > 0:
-                    (primary,secondaries) = domains[1]
-                    if conf.has_option(primary, "autocreate_folders"):
-                        _additional_folders = conf.get_raw(
-                                primary,
-                                "autocreate_folders"
-                            )
+
+                if len(domains.keys()) > 0:
+                    if domains.has_key(self.domain):
+                        primary = domains[self.domain]
+
+                        if conf.has_option(primary, "autocreate_folders"):
+                            _additional_folders = conf.get_raw(
+                                    primary,
+                                    "autocreate_folders"
+                                )
 
         if _additional_folders == None:
             if conf.has_option('kolab', "autocreate_folders"):

pykolab-0.8.1.tar.gz/pykolab/imap/cyrus.py Changed

@@ -25,12 +25,14 @@
 
 import pykolab
 
+from pykolab.constants import *
 from pykolab.imap import IMAP
 from pykolab.translate import _
 
 log = pykolab.getLogger('pykolab.imap')
 conf = pykolab.getConf()
 
+
 class Cyrus(cyruslib.CYRUS):
     """
         Abstraction class for some common actions to do exclusively in Cyrus.
@@ -70,14 +72,19 @@
 
         self.server = hostname
 
-        self.uri = "%s://%s:%s" % (scheme,hostname,port)
+        self.uri = "%s://%s:%s" % (scheme, hostname, port)
 
         while 1:
             try:
                 cyruslib.CYRUS.__init__(self, self.uri)
                 break
             except cyruslib.CYRUSError:
-                log.warning(_("Could not connect to Cyrus IMAP server %r") % (self.uri))
+                log.warning(
+                        _("Could not connect to Cyrus IMAP server %r") % (
+                                self.uri
+                            )
+                    )
+
                 time.sleep(10)
 
         if conf.debuglevel > 8:
@@ -134,17 +141,32 @@
         """
         cyruslib.CYRUS.login(self, *args, **kw)
         self.separator = self.SEP
+        try:
+            self._id()
+        except Exception, errmsg:
+            pass
+
+        log.debug(
+                _("Continuing with separator: %r") % (self.separator),
+                level=8
+            )
 
-        log.debug(_("Continuing with separator: %r") % (self.separator), level=8)
         self.murder = False
 
         for capability in self.m.capabilities:
             if capability.startswith("MUPDATE="):
-                log.debug(_("Detected we are running in a Murder topology"), level=8)
+                log.debug(
+                        _("Detected we are running in a Murder topology"),
+                        level=8
+                    )
+
                 self.murder = True
 
         if not self.murder:
-            log.debug(_("This system is not part of a murder topology"), level=8)
+            log.debug(
+                    _("This system is not part of a murder topology"),
+                    level=8
+                )
 
     def find_mailfolder_server(self, mailfolder):
         annotations = {}
@@ -153,8 +175,13 @@
 
         prefix = _mailfolder['path_parts'].pop(0)
         mbox = _mailfolder['path_parts'].pop(0)
-        if not _mailfolder['domain'] == None:
-            mailfolder = "%s%s%s@%s" % (prefix,self.separator,mbox,_mailfolder['domain'])
+        if _mailfolder['domain'] is not None:
+            mailfolder = "%s%s%s@%s" % (
+                    prefix,
+                    self.separator,
+                    mbox,
+                    _mailfolder['domain']
+                )
 
         # TODO: Workaround for undelete
         if len(self.lm(mailfolder)) < 1:
@@ -165,14 +192,20 @@
         if not self.murder:
             return self.server
 
-        log.debug(_("Checking actual backend server for folder %s through annotations") % (mailfolder), level=8)
+        log.debug(
+                _("Checking actual backend server for folder %s " +
+                    "through annotations") % (
+                        mailfolder
+                    ),
+                level=8
+            )
 
         if self.mbox.has_key(mailfolder):
             log.debug(
                     _(
-                            "Possibly reproducing the find " + \
-                            "mailfolder server answer from " + \
-                            "previously detected and stored " + \
+                            "Possibly reproducing the find " +
+                            "mailfolder server answer from " +
+                            "previously detected and stored " +
                             "annotation value: %r"
                         ) % (
                                 self.mbox[mailfolder]
@@ -185,26 +218,53 @@
 
         max_tries = 20
         num_try = 0
+
+        annotation_path = "/shared/vendor/cmu/cyrus-imapd/server"
+
         while 1:
             num_try += 1
-            annotations = self._getannotation(mailfolder, "/vendor/cmu/cyrus-imapd/server")
+            annotations = self._getannotation(
+                    mailfolder,
+                    annotation_path
+                )
 
             if annotations.has_key(mailfolder):
                 break
 
             if max_tries <= num_try:
-                log.error(_("Could not get the annotations after %s tries.") % (num_try))
-                annotations = { mailfolder: { '/shared/vendor/cmu/cyrus-imapd/server': self.server }}
+                log.error(
+                        _("Could not get the annotations after %s tries.") % (
+                                num_try
+                            )
+                    )
+
+                annotations = {
+                        mailfolder: {
+                                annotation_path: self.server
+                            }
+                    }
+
                 break
 
-            log.warning(_("No annotations for %s: %r") % (mailfolder,annotations))
+            log.warning(
+                    _("No annotations for %s: %r") % (
+                            mailfolder,
+                            annotations
+                        )
+                )
 
             time.sleep(1)
 
-        server = annotations[mailfolder]['/shared/vendor/cmu/cyrus-imapd/server']
+        server = annotations[mailfolder][annotation_path]
         self.mbox[mailfolder] = server
 
-        log.debug(_("Server for INBOX folder %s is %s") % (mailfolder,server), level=8)
+        log.debug(
+                _("Server for INBOX folder %s is %s") % (
+                        mailfolder,
+                        server
+                    ),
+                level=8
+            )
 
         return server
 
@@ -216,33 +276,68 @@
         from pykolab import imap_utf7
         return imap_utf7.decode(folder)
 
+    def _id(self, identity=None):
+        if identity is None:
+            identity = '("name" "Python/Kolab" "version" "%s")' % (__version__)
+
+        typ, dat = self.m._simple_command('ID', identity)
+        res, dat = self.m._untagged_response(typ, dat, 'ID')
+
     def _setquota(self, mailfolder, quota):
         """
             Login to the actual backend server.
         """
         server = self.find_mailfolder_server(mailfolder)
-        #print "server:", server
-        self.connect(self.uri.replace(self.server,server))
+        self.connect(self.uri.replace(self.server, server))
+
+        log.debug(
+                _("Setting quota for folder %s to %s") % (
+                        mailfolder,
+                        quota
+                    ),
+                level=8

pykolab-0.8.1.tar.gz/pykolab/setup/setup_roundcube.py Changed

pykolab-0.8.1.tar.gz/saslauthd/__init__.py Changed

pykolab-0.8.1.tar.gz/share/templates/roundcubemail/kolab_delegation.inc.php.tpl Changed

pykolab-0.8.1.tar.gz/wallace/__init__.py Changed

Changes of Revision 10