1 files changed, 28 insertions, 7 deletions

diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 675eb7c1b..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'));
+            }
         }
     }
 
@@ -59,7 +64,7 @@ class virtuser_query extends rcube_plugin
     {
         $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
+        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['email']));
 
         while ($sql_arr = $dbh->fetch_array($sql_result)) {
             if (strpos($sql_arr[0], '@')) {
@@ -78,8 +83,9 @@ class virtuser_query extends rcube_plugin
                     $result[] = $sql_arr[0];
                 }
 
-                if ($p['first'])
+                if ($p['first']) {
                     break;
+                }
             }
         }
 
@@ -95,7 +101,7 @@ class virtuser_query extends rcube_plugin
     {
         $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escapeSimple($p['email']), $this->config['user']));
+        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escape($p['email']), $this->config['user']));
 
         if ($sql_arr = $dbh->fetch_array($sql_result)) {
             $p['user'] = $sql_arr[0];
@@ -111,7 +117,7 @@ class virtuser_query extends rcube_plugin
     {
         $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['host']));
+        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['host']));
 
         if ($sql_arr = $dbh->fetch_array($sql_result)) {
             $p['host'] = $sql_arr[0];
@@ -121,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()
@@ -141,4 +163,3 @@ class virtuser_query extends rcube_plugin
     }
 
 }
-