From 7b69636a7035f4641b9a6bea28a8aa813b443e44 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 17 Jul 2013 02:24:16 -0400
Subject: [PATCH] Merge branch 'patch-1' of https://github.com/gerundt/roundcubemail into gerundt-patch-1 from pull request #74
---
plugins/virtuser_query/virtuser_query.php | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 04dcaf1..3181cda 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 <alec@alec.pl>
* @author Steffen Vogel
+ * @author Tim Gerundt
* @license GNU GPLv3+
*/
class virtuser_query extends rcube_plugin
@@ -49,6 +50,9 @@
}
if ($this->config['host']) {
$this->add_hook('authenticate', array($this, 'user2host'));
+ }
+ if ($this->config['alias']) {
+ $this->add_hook('authenticate', array($this, 'alias2user'));
}
}
}
@@ -123,6 +127,22 @@
}
/**
+ * 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
*/
function get_dbh()
@@ -143,4 +163,3 @@
}
}
-
--
Gitblit v1.9.1