Ticket #1486750: virtuser_query.patch

*** virtuser_query.php  2010-04-23 11:25:22.000000000 +0200
--- virtuser_query.php.new      2010-05-22 16:37:10.000000000 +0200
***************
*** 4,19 ****
   * DB based User-to-Email and Email-to-User lookup
   *
   * Add it to the plugins list in config/main.inc.php and set
!  * SQL query to resolve user names and e-mail addresses from the database
   * %u will be replaced with the current username for login.
!  * The query should select the user's e-mail address as first column
!  * and optional identity data columns in specified order:
   *    name, organization, reply-to, bcc, signature, html_signature
   *
!  * $rcmail_config['virtuser_query'] = '';
   *
!  * @version 1.0
   * @author Aleksander Machniak
   */
  class virtuser_query extends rcube_plugin
  {
--- 4,21 ----
   * DB based User-to-Email and Email-to-User lookup
   *
   * Add it to the plugins list in config/main.inc.php and set
!  * SQL queries to resolve usernames, e-mail addresses and hostnames from the database
   * %u will be replaced with the current username for login.
!  * %m will be replaced with the current e-mail address for login.
!  * The query should select the user's e-mail address, username or the imap hostname as first column
!  * The email query could optionally select identity data columns in specified order:
   *    name, organization, reply-to, bcc, signature, html_signature
   *
!  * $rcmail_config['virtuser_query'] = array('user' => '', 'email' => '', 'host' => '');
   *
!  * @version 1.1
   * @author Aleksander Machniak
+  * @author Steffen Vogel
   */
  class virtuser_query extends rcube_plugin
  {
***************
*** 22,34 ****
  
      function init()
      {
!           $this->app = rcmail::get_instance();
!           $this->query = $this->app->config->get('virtuser_query');
  
!           if ($this->query) {
!               $this->add_hook('user2email', array($this, 'user2email'));
! //            $this->add_hook('email2user', array($this, 'email2user'));
!           }
      }
  
      /**
--- 24,48 ----
  
      function init()
      {
!       $this->app = rcmail::get_instance();
!       $this->config = $this->app->config->get('virtuser_query');
  
!       if (is_array($this->config)) {
!               if ($this->config['email']) {
!                   $this->add_hook('user2email', array($this, 'user2email'));
!               }
!       
!               if ($this->config['user']) {
!                   $this->add_hook('email2user', array($this, 'email2user'));
!               }
!       
!               if ($this->config['host']) {
!                   $this->add_hook('authenticate', array($this, 'user2host'));
!               }
!       }
!       elseif (is_string($this->config)) {
!               $this->add_hook('user2email', array($this, 'user2email'));
!       }
      }
  
      /**
***************
*** 36,70 ****
       */
      function user2email($p)
      {
!           $dbh = $this->app->get_dbh();
  
!           $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->query));
  
!           while ($sql_arr = $dbh->fetch_array($sql_result)) {
!               if (strpos($sql_arr[0], '@')) {
!                       if ($p['extended'] && count($sql_arr) > 1) {
!                           $result[] = array(
!                                   'email'         => $sql_arr[0],
!                               'name'              => $sql_arr[1],
!                                   'organization'  => $sql_arr[2],
!                               'reply-to'          => $sql_arr[3],
!                                   'bcc'                   => $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;
      }
  
  }
--- 50,115 ----
       */
      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'         => $sql_arr[0],
!                       'name'          => $sql_arr[1],
!                       'organization'  => $sql_arr[2],
!                       'reply-to'      => $sql_arr[3],
!                       'bcc'           => $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;
      }
  
+     /**
+      * EMail > User
+      */
+     function email2user($p)
+     {
+       $dbh = $this->app->get_dbh();
+ 
+       $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escapeSimple($p['email']), $this->config['user']));
+ 
+       if ($sql_arr = $dbh->fetch_array($sql_result)) {
+               $p['user'] = $sql_arr[0];
+       }
+ 
+       return $p;
+     }
+ 
+     /**
+      * User > Host
+      */
+     function user2host($p)
+     {
+       $dbh = $this->app->get_dbh();
+ 
+       $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['host']));
+ 
+       if ($sql_arr = $dbh->fetch_array($sql_result)) {
+               $p['host'] = $sql_arr[0];
+       }
+ 
+       return $p;
+     }
  }