Add rcube_db::escapeSimple() method for backward compat.

Aleksander Machniak

2013-04-17 39a034b50d65dca9215059b0e001ec1de41d0406

 plugins/virtuser_query/virtuser_query.php

@@ -14,19 +14,26 @@
 *
 * $rcmail_config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '');
 *
 * 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 Aleksander Machniak <alec@alec.pl>
 * @author Steffen Vogel
 */
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)) {
@@ -50,35 +57,36 @@
     */
    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']));
        $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];
              }
        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;
    }

    /**
@@ -86,9 +94,9 @@
     */
    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']));
        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->quote($p['email']), $this->config['user']));

        if ($sql_arr = $dbh->fetch_array($sql_result)) {
            $p['user'] = $sql_arr[0];
@@ -102,9 +110,9 @@
     */
    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']));
        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->quote($p['user']), $this->config['host']));

        if ($sql_arr = $dbh->fetch_array($sql_result)) {
            $p['host'] = $sql_arr[0];
@@ -113,5 +121,25 @@
        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;
    }

}