summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/virtuser_query/package.xml6
-rw-r--r--plugins/virtuser_query/virtuser_query.php30
2 files changed, 30 insertions, 6 deletions
diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml
index 58f697019..b7ea565d8 100644
--- a/plugins/virtuser_query/package.xml
+++ b/plugins/virtuser_query/package.xml
@@ -13,10 +13,10 @@
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2011-11-21</date>
+ <date>2012-02-17</date>
<version>
- <release>1.1</release>
- <api>1.1</api>
+ <release>2.0</release>
+ <api>2.0</api>
</version>
<stability>
<release>stable</release>
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index c479a4f7f..675eb7c1b 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,7 +57,7 @@ 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']));
@@ -89,7 +93,7 @@ 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']));
@@ -105,7 +109,7 @@ 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']));
@@ -116,5 +120,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;
+ }
+
}