From 61be822d62ea245b7f54ad313f49a956ab49076d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 18 Jan 2013 15:24:49 +0100 Subject: Remove deprecated functions (from bc.php file) usage in plugins --- plugins/virtuser_query/virtuser_query.php | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'plugins/virtuser_query/virtuser_query.php') diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index 073b4e230..c479a4f7f 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -28,8 +28,8 @@ class virtuser_query extends rcube_plugin 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 +53,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->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_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; } /** -- cgit v1.2.3 From f5fcb92dd49622c9938462935202eeb1765cfc7c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 17 Feb 2013 11:04:43 +0100 Subject: Add posibility to use different database for virtuser queries --- plugins/virtuser_query/package.xml | 6 +++--- plugins/virtuser_query/virtuser_query.php | 30 +++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) (limited to 'plugins/virtuser_query/virtuser_query.php') 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 @@ alec@alec.pl yes - 2011-11-21 + 2012-02-17 - 1.1 - 1.1 + 2.0 + 2.0 stable 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 * @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; + } + } -- cgit v1.2.3