From abacd6e3c4394c8ed38236b3c46e995868a37b5e Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Sat, 25 May 2013 16:22:47 +0300 Subject: Support Alias-to-User lookup with virtuser_query --- plugins/virtuser_query/virtuser_query.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index 9e3dc9071..9cf27e61c 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -12,7 +12,7 @@ * The email query could optionally select identity data columns in specified order: * name, organization, reply-to, bcc, signature, html_signature * - * $rcmail_config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => ''); + * $rcmail_config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '', 'alias' => ''); * * The email query can return more than one record to create more identities. * This requires identities_level option to be set to value less than 2. @@ -23,6 +23,7 @@ * @version @package_version@ * @author Aleksander Machniak * @author Steffen Vogel + * @author Tim Gerundt */ class virtuser_query extends rcube_plugin { @@ -49,6 +50,9 @@ class virtuser_query extends rcube_plugin if ($this->config['host']) { $this->add_hook('authenticate', array($this, 'user2host')); } + if ($this->config['alias']) { + $this->add_hook('authenticate', array($this, 'alias2user')); + } } } @@ -121,6 +125,22 @@ class virtuser_query extends rcube_plugin return $p; } + /** + * Alias > User + */ + function alias2user($p) + { + $dbh = $this->get_dbh(); + + $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['alias'])); + + if ($sql_arr = $dbh->fetch_array($sql_result)) { + $p['user'] = $sql_arr[0]; + } + + return $p; + } + /** * Initialize database handler */ @@ -142,4 +162,3 @@ class virtuser_query extends rcube_plugin } } - -- cgit v1.2.3