diff options
Diffstat (limited to 'plugins/virtuser_query/virtuser_query.php')
| -rw-r--r-- | plugins/virtuser_query/virtuser_query.php | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index c479a4f7f..9e3dc9071 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -17,6 +17,9 @@ * 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. * + * By default Roundcube database is used. To use different database (or host) + * you can specify DSN string in $rcmail_config['virtuser_query_dsn'] option. + * * @version @package_version@ * @author Aleksander Machniak <alec@alec.pl> * @author Steffen Vogel @@ -25,6 +28,7 @@ class virtuser_query extends rcube_plugin { private $config; private $app; + private $db; function init() { @@ -53,9 +57,9 @@ class virtuser_query extends rcube_plugin */ function user2email($p) { - $dbh = $this->app->get_dbh(); + $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], '@')) { @@ -74,8 +78,9 @@ class virtuser_query extends rcube_plugin $result[] = $sql_arr[0]; } - if ($p['first']) + if ($p['first']) { break; + } } } @@ -89,9 +94,9 @@ class virtuser_query extends rcube_plugin */ function email2user($p) { - $dbh = $this->app->get_dbh(); + $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]; @@ -105,9 +110,9 @@ class virtuser_query extends rcube_plugin */ function user2host($p) { - $dbh = $this->app->get_dbh(); + $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]; @@ -116,5 +121,25 @@ class virtuser_query extends rcube_plugin return $p; } + /** + * Initialize database handler + */ + function get_dbh() + { + if (!$this->db) { + if ($dsn = $this->app->config->get('virtuser_query_dsn')) { + // connect to the virtuser database + $this->db = rcube_db::factory($dsn); + $this->db->set_debug((bool)$this->app->config->get('sql_debug')); + $this->db->db_connect('r'); // connect in read mode + } + else { + $this->db = $this->app->get_dbh(); + } + } + + return $this->db; + } + } |