summaryrefslogtreecommitdiff
path: root/plugins/virtuser_query
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/virtuser_query')
-rw-r--r--plugins/virtuser_query/package.xml6
-rw-r--r--plugins/virtuser_query/tests/VirtuserQuery.php23
-rw-r--r--plugins/virtuser_query/virtuser_query.php90
3 files changed, 83 insertions, 36 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/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQuery.php
new file mode 100644
index 000000000..d5bd4ee4b
--- /dev/null
+++ b/plugins/virtuser_query/tests/VirtuserQuery.php
@@ -0,0 +1,23 @@
+<?php
+
+class VirtuserQuery_Plugin extends PHPUnit_Framework_TestCase
+{
+
+ function setUp()
+ {
+ include_once dirname(__FILE__) . '/../virtuser_query.php';
+ }
+
+ /**
+ * Plugin object construction test
+ */
+ function test_constructor()
+ {
+ $rcube = rcube::get_instance();
+ $plugin = new virtuser_query($rcube->api);
+
+ $this->assertInstanceOf('virtuser_query', $plugin);
+ $this->assertInstanceOf('rcube_plugin', $plugin);
+ }
+}
+
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 073b4e230..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,11 +28,12 @@ class virtuser_query extends rcube_plugin
{
private $config;
private $app;
+ private $db;
function init()
{
- $this->app = rcmail::get_instance();
- $this->config = $this->app->config->get('virtuser_query');
+ $this->app = rcmail::get_instance();
+ $this->config = $this->app->config->get('virtuser_query');
if (!empty($this->config)) {
if (is_string($this->config)) {
@@ -53,35 +57,35 @@ class virtuser_query extends rcube_plugin
*/
function user2email($p)
{
- $dbh = $this->app->get_dbh();
-
- $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
-
- while ($sql_arr = $dbh->fetch_array($sql_result)) {
- if (strpos($sql_arr[0], '@')) {
- if ($p['extended'] && count($sql_arr) > 1) {
- $result[] = array(
- 'email' => rcube_idn_to_ascii($sql_arr[0]),
- 'name' => $sql_arr[1],
- 'organization' => $sql_arr[2],
- 'reply-to' => rcube_idn_to_ascii($sql_arr[3]),
- 'bcc' => rcube_idn_to_ascii($sql_arr[4]),
- 'signature' => $sql_arr[5],
- 'html_signature' => (int)$sql_arr[6],
- );
- }
- else {
- $result[] = $sql_arr[0];
- }
-
- if ($p['first'])
- break;
- }
- }
-
- $p['email'] = $result;
-
- return $p;
+ $dbh = $this->get_dbh();
+
+ $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
+
+ while ($sql_arr = $dbh->fetch_array($sql_result)) {
+ if (strpos($sql_arr[0], '@')) {
+ if ($p['extended'] && count($sql_arr) > 1) {
+ $result[] = array(
+ 'email' => rcube_utils::idn_to_ascii($sql_arr[0]),
+ 'name' => $sql_arr[1],
+ 'organization' => $sql_arr[2],
+ 'reply-to' => rcube_utils::idn_to_ascii($sql_arr[3]),
+ 'bcc' => rcube_utils::idn_to_ascii($sql_arr[4]),
+ 'signature' => $sql_arr[5],
+ 'html_signature' => (int)$sql_arr[6],
+ );
+ }
+ else {
+ $result[] = $sql_arr[0];
+ }
+
+ if ($p['first'])
+ break;
+ }
+ }
+
+ $p['email'] = $result;
+
+ return $p;
}
/**
@@ -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;
+ }
+
}