From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/tpl/debian6_dovecot-sql.conf.master | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index b04abde..6729a93 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -13,20 +13,6 @@
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
default_pass_scheme = CRYPT
-password_query = SELECT password FROM mail_user \
- WHERE login = '%u' AND disable%Ls = 'n'
-
-# Old user query quota part
-# CONCAT('*:storage=', quota , 'B') AS quota_rule
-# Old user query with email instead of login
-# WHERE email = '%u' AND disable%Ls = 'n'
-
-user_query = SELECT email as user, \
- maildir as home, \
- CONCAT('maildir:', maildir, '/Maildir') as mail, \
- uid, \
- gid, \
- CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, \
- CONCAT(maildir, '/.sieve') as sieve \
- FROM mail_user \
- WHERE email = '%u' AND disable%Ls = 'n'
+password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
--
Gitblit v1.9.1