diff options
Diffstat (limited to 'plugins/virtuser_query')
| -rw-r--r-- | plugins/virtuser_query/package.xml | 2 | ||||
| -rw-r--r-- | plugins/virtuser_query/virtuser_query.php | 26 |
2 files changed, 24 insertions, 4 deletions
diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml index b7ea565d8..9430bf69d 100644 --- a/plugins/virtuser_query/package.xml +++ b/plugins/virtuser_query/package.xml @@ -22,7 +22,7 @@ <release>stable</release> <api>stable</api> </stability> - <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> + <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license> <notes>-</notes> <contents> <dir baseinstalldir="/" name="/"> diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index 9e3dc9071..3181cda94 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -3,7 +3,7 @@ /** * DB based User-to-Email and Email-to-User lookup * - * Add it to the plugins list in config/main.inc.php and set + * Add it to the plugins list in config.inc.php and set * SQL queries to resolve usernames, e-mail addresses and hostnames from the database * %u will be replaced with the current username for login. * %m will be replaced with the current e-mail address for login. @@ -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,8 @@ * @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 +51,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')); + } } } @@ -122,6 +127,22 @@ class virtuser_query extends rcube_plugin } /** + * 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() @@ -142,4 +163,3 @@ class virtuser_query extends rcube_plugin } } - |