From 61be822d62ea245b7f54ad313f49a956ab49076d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 18 Jan 2013 09:24:49 -0500
Subject: [PATCH] Remove deprecated functions (from bc.php file) usage in plugins
---
plugins/virtuser_query/virtuser_query.php | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 073b4e2..c479a4f 100644
--- a/plugins/virtuser_query/virtuser_query.php
+++ b/plugins/virtuser_query/virtuser_query.php
@@ -28,8 +28,8 @@
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 @@
*/
function user2email($p)
{
- $dbh = $this->app->get_dbh();
+ $dbh = $this->app->get_dbh();
- $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
+ $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];
- }
+ 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;
- }
- }
+ if ($p['first'])
+ break;
+ }
+ }
- $p['email'] = $result;
+ $p['email'] = $result;
- return $p;
+ return $p;
}
/**
--
Gitblit v1.9.1