Commits

Zhang Huangbin committed 3e6c6ea

Incorrect SQL syntax.
Thanks losinggeneration _at_ gmail.com for the report and patch.

  • Participants
  • Parent commits f0901d3

Comments (0)

Files changed (4)

File ChangeLog.dbmail_mysql

+= 1.1.1 =
+    * Fixed:
+        * Incorrect SQL syntax.
+          Thanks losinggeneration _at_ gmail.com for the report and patch.
+
 = 1.1.0 =
     * Improvements:
         + Show search string in search result page.

File libs/__init__.py

 __version_ldap__ = '1.6.4'
 __version_mysql__ = '1.3.2'
 __version_pgsql__ = '1.0'
-__version_dbmail_mysql__ = '1.1.0'
+__version_dbmail_mysql__ = '1.1.1'
 __url_latest_ldap__ = 'http://iredmail.org/version/check.py/pro_ldap.xml'
 __url_latest_mysql__ = 'http://iredmail.org/version/check.py/pro_mysql.xml'
 __url_latest_pgsql__ = 'http://iredmail.org/version/check.py/pro_pgsql.xml'

File libs/dbmail_mysql/connUtils.py

 
         sql_left_join = ''
         if listedOnly is False:
-            sql_left_join = """OR domain_admins.domain='ALL'"""
+            sql_left_join = """OR dbmail_domain_admins.domain='ALL'"""
 
         try:
             result = self.conn.query(

File libs/dbmail_mysql/domain.py

                 -- LEFT JOIN recipient_bcc_domain AS rbcc ON (rbcc.domain=dbmail_domains.domain)
                 LEFT JOIN dbmail_users ON (dbmail_domains.domain = dbmail_users.domain)
                 LEFT JOIN dbmail_aliases_extra ON (dbmail_domains.domain = dbmail_aliases_extra.alias)
-                WHERE dbmail_domains.domain=$domain,
+                WHERE dbmail_domains.domain=$domain
                 GROUP BY
                     dbmail_domains.domain, dbmail_domains.description, dbmail_domains.aliases,
                     dbmail_domains.mailboxes, dbmail_domains.maxquota, dbmail_domains.quota,