From e62a4c426dedf562b763864772e0398d5044a4e3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 8 Nov 2013 11:01:05 +0100 Subject: [PATCH] Replace old occurences of 'admin_user' by 'core_user'. --- doc/integration/imap_and_smtp.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index a8df706ba..2c90a9fe5 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -136,11 +136,11 @@ MySQL users default_pass_scheme = CRYPT - password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active=1 + password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active=1 user_query = SELECT '/%d/%n' AS home, as uid, as gid, concat('*:bytes=', mb.quota, 'M') AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d' - iterate_query = SELECT email AS username FROM admin_user + iterate_query = SELECT email AS username FROM core_user .. _dovecot_pg_queries: @@ -155,11 +155,11 @@ PostgreSQL users default_pass_scheme = CRYPT - password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active + password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active user_query = SELECT '/%d/%n' AS home, as uid, as gid, '*:bytes=' || mb.quota || 'M' AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d' - iterate_query = SELECT email AS username FROM admin_user + iterate_query = SELECT email AS username FROM core_user SQLite users ------------ @@ -172,11 +172,11 @@ SQLite users default_pass_scheme = CRYPT - password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active=1 + password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active=1 user_query = SELECT '/%d/%n' AS home, as uid, as gid, ('*:bytes=' || mb.quota || 'M') AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d' - iterate_query = SELECT email AS username FROM admin_user + iterate_query = SELECT email AS username FROM core_user .. note:: @@ -323,7 +323,7 @@ work for Modoboa. You should use the following one instead: DECLARE mboxid INTEGER; BEGIN - SELECT admin_mailbox.id INTO STRICT mboxid FROM admin_mailbox INNER JOIN admin_user ON admin_mailbox.user_id=admin_user.id WHERE admin_user.username=NEW.username; + SELECT admin_mailbox.id INTO STRICT mboxid FROM admin_mailbox INNER JOIN core_user ON admin_mailbox.user_id=core_user.id WHERE core_user.username=NEW.username; UPDATE admin_quota SET mbox_id = mboxid WHERE username = NEW.username; RETURN NULL;