From 51c2c63a898801a7a6839f7b08313c12ddd1c47f Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 1 Mar 2011 11:44:32 +0100 Subject: [PATCH] Changes email_virtual type from 'user' to 'alias'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- classes/user.php | 4 ++-- include/emails.inc.php | 12 ++++++------ upgrade/1.1.0/01_new_mail_schema.sql | 2 +- upgrade/1.1.0/02_new_mail_insertion.sql | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/classes/user.php b/classes/user.php index e4ab7fe..1735ebf 100644 --- a/classes/user.php +++ b/classes/user.php @@ -373,7 +373,7 @@ class User extends PlUser INNER JOIN email_source_account AS s ON (s.uid = {?}) INNER JOIN email_virtual_domains AS ms ON (s.domain = ms.id) INNER JOIN email_virtual_domains AS ds ON (ds.aliasing = ms.id) - WHERE v.redirect = CONCAT(s.email, \'@\', ds.name) AND v.type = \'user\'', + WHERE v.redirect = CONCAT(s.email, \'@\', ds.name) AND v.type = \'alias\'', $this->id()); } else { return XDB::fetchAllAssoc('alias', @@ -383,7 +383,7 @@ class User extends PlUser INNER JOIN email_source_account AS s ON (s.uid = {?}) INNER JOIN email_virtual_domains AS ms ON (s.domain = ms.id) INNER JOIN email_virtual_domains AS ds ON (ds.aliasing = ms.id) - WHERE v.type = \'user\' + WHERE v.type = \'alias\' GROUP BY v.email ORDER BY v.email', $domain, $this->id()); diff --git a/include/emails.inc.php b/include/emails.inc.php index ccd3890..a48da50 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -24,7 +24,7 @@ define('ERROR_INACTIVE_REDIRECTION', 2); define('ERROR_INVALID_EMAIL', 3); define('ERROR_LOOP_EMAIL', 4); -function add_to_list_alias(User $user, $local_part, $domain, $type = 'user') +function add_to_list_alias(User $user, $local_part, $domain, $type = 'alias') { Platal::assert($user !== null); @@ -35,7 +35,7 @@ function add_to_list_alias(User $user, $local_part, $domain, $type = 'user') $local_part, $user->forlifeEmail(), $type, $domain); } -function delete_from_list_alias(User $user, $local_part, $domain, $type = 'user') +function delete_from_list_alias(User $user, $local_part, $domain, $type = 'alias') { Platal::assert($user !== null); @@ -47,7 +47,7 @@ function delete_from_list_alias(User $user, $local_part, $domain, $type = 'user' $local_part, $domain, $user->forlifeEmail(), $type); } -function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'user') +function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'alias') { Platal::assert($user !== null); @@ -64,7 +64,7 @@ function list_alias_members($local_part, $domain) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) - WHERE v.email = {?} AND d.name = {?} AND type = \'user\'', + WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'', $local_part, $domain); $members = array(); @@ -81,7 +81,7 @@ function delete_list_alias($local_part, $domain) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) - WHERE v.email = {?} AND d.name = {?} AND type = \'user\'', + WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'', $local_part, $domain); } @@ -90,7 +90,7 @@ function iterate_list_alias($domain) return XDB::fetchColumn('SELECT CONCAT(v.email, \'@\', m.name) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) - WHERE m.name = {?} AND v.type = \'user\' + WHERE m.name = {?} AND v.type = \'alias\' GROUP BY v.email', $domain); } diff --git a/upgrade/1.1.0/01_new_mail_schema.sql b/upgrade/1.1.0/01_new_mail_schema.sql index 849fbae..caca7d2 100644 --- a/upgrade/1.1.0/01_new_mail_schema.sql +++ b/upgrade/1.1.0/01_new_mail_schema.sql @@ -83,7 +83,7 @@ CREATE TABLE email_virtual ( email VARCHAR(255) NOT NULL, domain SMALLINT(3) UNSIGNED NOT NULL DEFAULT 1, redirect VARCHAR(255) NOT NULL, - type ENUM('user', 'list', 'event', 'admin', 'partner'), + type ENUM('alias', 'list', 'event', 'admin', 'partner'), expire DATE NOT NULL DEFAULT '0000-00-00', PRIMARY KEY (email, domain, redirect), KEY (domain), diff --git a/upgrade/1.1.0/02_new_mail_insertion.sql b/upgrade/1.1.0/02_new_mail_insertion.sql index 8edc6f8..6fd0c15 100644 --- a/upgrade/1.1.0/02_new_mail_insertion.sql +++ b/upgrade/1.1.0/02_new_mail_insertion.sql @@ -145,7 +145,7 @@ INSERT INTO email_virtual (email, type, domain, redirect) WHERE type = 'liste'; INSERT INTO email_virtual (email, redirect, domain, type) - SELECT SUBSTRING_INDEX(v.alias, '@', 1), vr.redirect, @m_domain_id, 'user' + SELECT SUBSTRING_INDEX(v.alias, '@', 1), vr.redirect, @m_domain_id, 'alias' FROM virtual AS v LEFT JOIN virtual_redirect AS vr ON (v.vid = vr.vid) LEFT JOIN accounts AS a ON (a.hruid = LEFT(vr.redirect, LOCATE('@', vr.redirect) - 1)) -- 2.1.4