From 443a01ee2189976a753dfc77479a593e1e079445 Mon Sep 17 00:00:00 2001
From: "Jesus Perez (Ultreia)" <jperez@ultreia.es>
Date: Fri, 5 Feb 2016 11:18:39 +0000
Subject: [PATCH 1/4] Fix trying to deliver messages to usernames of group
 members instead of their e-mail addresses.

---
 docs/debian-conf.d/router/250_vexim_virtual_domains | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/debian-conf.d/router/250_vexim_virtual_domains b/docs/debian-conf.d/router/250_vexim_virtual_domains
index 326fb39c..fbaabba0 100644
--- a/docs/debian-conf.d/router/250_vexim_virtual_domains
+++ b/docs/debian-conf.d/router/250_vexim_virtual_domains
@@ -95,7 +95,7 @@ virtual_dom_groups:
                                             d.domain_id = g.domain_id and g.enabled = '1' and \
                                             g.name = '${quote_mysql:$local_part}'}}} \
                  {$sender_address} \
-                 {${lookup mysql{select u.username \
+                 {${lookup mysql{select concat_ws('@', localpart, d.domain) \
                                  from domains d, groups g, group_contents c, users u \
                                  where d.enabled = '1' and d.domain = '${quote_mysql:$domain}' and \
                                        d.domain_id = g.domain_id and g.name = '${quote_mysql:$local_part}' and \
@@ -104,7 +104,7 @@ virtual_dom_groups:
                                        d.domain_id = u.domain_id and u.enabled = '1' \
                                        and u.username = '${quote_mysql:$sender_address}' }}}}
   data = ${lookup mysql{ \
-            select u.username \
+            select concat_ws('@', localpart, d.domain) \
             from domains d, groups g, group_contents c, users u \
             where d.enabled     = '1'           and \
                   d.domain      = '${quote_mysql:$domain}'   and \

From 7370d7f6dcf822b8186e76c31656e5dd4a3e8097 Mon Sep 17 00:00:00 2001
From: "Jesus Perez (Ultreia)" <jperez@ultreia.es>
Date: Tue, 9 Feb 2016 10:33:55 +0100
Subject: [PATCH 2/4] Fix members e-mail addresses when editing a group.

---
 vexim/admingroupchange.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vexim/admingroupchange.php b/vexim/admingroupchange.php
index a30f45df..d41a045a 100644
--- a/vexim/admingroupchange.php
+++ b/vexim/admingroupchange.php
@@ -75,7 +75,7 @@ class="textfield">
         <tr>
           <td colspan="2"> 
             <?php
-              $query = "SELECT u.realname, u.username, u.enabled, c.member_id
+              $query = "SELECT u.realname, u.localpart, u.enabled, c.member_id
                 FROM users u, group_contents c
                 WHERE u.user_id=c.member_id and c.group_id=:group_id
                 ORDER BY u.enabled desc, u.realname asc";
@@ -106,7 +106,7 @@ class="textfield">
                   </a>
                 </td>
                 <td><?php echo $row['realname']; ?></td>
-                <td><?php echo $row['username']; ?></td>
+                <td><?php echo $row['localpart'].'@'.$_SESSION['domain']; ?></td>
                 <td>
                   <?php
                     if($row['enabled']='1') {
@@ -143,7 +143,7 @@ class="textfield">
               <select name="usertoadd">
                 <option selected value=""></option>
                 <?php
-                  $query = "SELECT realname, username, user_id FROM users
+                  $query = "SELECT realname, localpart, user_id FROM users
                     WHERE enabled='1' AND domain_id=:domain_id AND type!='fail'
                     ORDER BY realname, username, type desc";
                   $sth = $dbh->prepare($query);
@@ -152,7 +152,7 @@ class="textfield">
                 ?>
                   <option value="<?php echo $row['user_id']; 
 					?>"><?php echo $row['realname']; 
-					?>(<?php echo $row['username']; ?>)</option>
+					?> (<?php echo $row['localpart'].'@'.$_SESSION['domain']; ?>)</option>
                 <?php 
                   }
                 ?>

From db4f86b3426a8eab489c5129357682d4eada2685 Mon Sep 17 00:00:00 2001
From: "Jesus Perez (Ultreia)" <jperez@ultreia.es>
Date: Tue, 9 Feb 2016 10:39:29 +0100
Subject: [PATCH 3/4] Replicate commit 443a01e in single-file exim
 configuration.

---
 docs/configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configure b/docs/configure
index 98eb82b1..9a330a2f 100644
--- a/docs/configure
+++ b/docs/configure
@@ -701,7 +701,7 @@ virtual_dom_groups:
                                             d.domain_id = g.domain_id and g.enabled = '1' and \
                                             g.name = '${quote_mysql:$local_part}'}}} \
                  {$sender_address} \
-                 {${lookup mysql{select u.username \
+                 {${lookup mysql{select concat_ws('@', localpart, d.domain) \
                                  from domains d, groups g, group_contents c, users u \
                                  where d.enabled = '1' and d.domain = '${quote_mysql:$domain}' and \
                                        d.domain_id = g.domain_id and g.name = '${quote_mysql:$local_part}' and \
@@ -710,7 +710,7 @@ virtual_dom_groups:
                                        d.domain_id = u.domain_id and u.enabled = '1' \
 				       and u.username = '${quote_mysql:$sender_address}' }}}}
   data = ${lookup mysql{ \
-            select u.username \
+            select concat_ws('@', localpart, d.domain) \
             from domains d, groups g, group_contents c, users u \
             where d.enabled     = '1'           and \
                   d.domain      = '${quote_mysql:$domain}'   and \

From 6e5ef52a949fcb467fb88eef9f6489fc0930c851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20P=C3=A9rez=20=28Ultreia=29?=
 <jperez@ultreia.es>
Date: Tue, 9 Feb 2016 13:03:55 +0100
Subject: [PATCH 4/4] Prepend table names in select fields as suggested by
 @rimas-kudelis.

---
 docs/configure                                      | 4 ++--
 docs/debian-conf.d/router/250_vexim_virtual_domains | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/configure b/docs/configure
index 9a330a2f..4ff20ef4 100644
--- a/docs/configure
+++ b/docs/configure
@@ -701,7 +701,7 @@ virtual_dom_groups:
                                             d.domain_id = g.domain_id and g.enabled = '1' and \
                                             g.name = '${quote_mysql:$local_part}'}}} \
                  {$sender_address} \
-                 {${lookup mysql{select concat_ws('@', localpart, d.domain) \
+                 {${lookup mysql{select concat_ws('@', u.localpart, d.domain) \
                                  from domains d, groups g, group_contents c, users u \
                                  where d.enabled = '1' and d.domain = '${quote_mysql:$domain}' and \
                                        d.domain_id = g.domain_id and g.name = '${quote_mysql:$local_part}' and \
@@ -710,7 +710,7 @@ virtual_dom_groups:
                                        d.domain_id = u.domain_id and u.enabled = '1' \
 				       and u.username = '${quote_mysql:$sender_address}' }}}}
   data = ${lookup mysql{ \
-            select concat_ws('@', localpart, d.domain) \
+            select concat_ws('@', u.localpart, d.domain) \
             from domains d, groups g, group_contents c, users u \
             where d.enabled     = '1'           and \
                   d.domain      = '${quote_mysql:$domain}'   and \
diff --git a/docs/debian-conf.d/router/250_vexim_virtual_domains b/docs/debian-conf.d/router/250_vexim_virtual_domains
index fbaabba0..32c7f915 100644
--- a/docs/debian-conf.d/router/250_vexim_virtual_domains
+++ b/docs/debian-conf.d/router/250_vexim_virtual_domains
@@ -95,7 +95,7 @@ virtual_dom_groups:
                                             d.domain_id = g.domain_id and g.enabled = '1' and \
                                             g.name = '${quote_mysql:$local_part}'}}} \
                  {$sender_address} \
-                 {${lookup mysql{select concat_ws('@', localpart, d.domain) \
+                 {${lookup mysql{select concat_ws('@', u.localpart, d.domain) \
                                  from domains d, groups g, group_contents c, users u \
                                  where d.enabled = '1' and d.domain = '${quote_mysql:$domain}' and \
                                        d.domain_id = g.domain_id and g.name = '${quote_mysql:$local_part}' and \
@@ -104,7 +104,7 @@ virtual_dom_groups:
                                        d.domain_id = u.domain_id and u.enabled = '1' \
                                        and u.username = '${quote_mysql:$sender_address}' }}}}
   data = ${lookup mysql{ \
-            select concat_ws('@', localpart, d.domain) \
+            select concat_ws('@', u.localpart, d.domain) \
             from domains d, groups g, group_contents c, users u \
             where d.enabled     = '1'           and \
                   d.domain      = '${quote_mysql:$domain}'   and \