summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-17 17:10:55 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-17 17:10:55 +0200
commitfa04e19be39bf5af7d1a4d507b10316a0e0609f2 (patch)
tree3af3358ee20bfd5d2a3814ea9a1c6d22b1c171a1
parentd8752c9839eab790487928e923c1c4b37ce1c12e (diff)
CS fixes (converted tabs to spaces)
-rw-r--r--plugins/virtuser_query/virtuser_query.php63
1 files changed, 32 insertions, 31 deletions
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index b6d84c952..6eb7ad647 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,36 @@ class virtuser_query extends rcube_plugin
*/
function user2email($p)
{
- $dbh = $this->app->get_dbh();
-
- $sql_result = $dbh->query(preg_replace('/%u/', $dbh->quote($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->quote($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;
}
/**