Refactoring in groups cache handling code, CS fixes

Aleksander Machniak

2013-06-26 4feb8eb575df1207ed1dce3efcabbec48d7db169

 plugins/virtuser_query/virtuser_query.php

@@ -23,6 +23,7 @@
 * @version @package_version@
 * @author Aleksander Machniak <alec@alec.pl>
 * @author Steffen Vogel
 * @license GNU GPLv3+
 */
class virtuser_query extends rcube_plugin
{
@@ -59,7 +60,7 @@
    {
        $dbh = $this->get_dbh();

        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['email']));

        while ($sql_arr = $dbh->fetch_array($sql_result)) {
            if (strpos($sql_arr[0], '@')) {
@@ -78,8 +79,9 @@
                    $result[] = $sql_arr[0];
                }

                if ($p['first'])
                if ($p['first']) {
                    break;
                }
            }
        }

@@ -95,7 +97,7 @@
    {
        $dbh = $this->get_dbh();

        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escapeSimple($p['email']), $this->config['user']));
        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escape($p['email']), $this->config['user']));

        if ($sql_arr = $dbh->fetch_array($sql_result)) {
            $p['user'] = $sql_arr[0];
@@ -111,7 +113,7 @@
    {
        $dbh = $this->get_dbh();

        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['host']));
        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['host']));

        if ($sql_arr = $dbh->fetch_array($sql_result)) {
            $p['host'] = $sql_arr[0];