Changeset 5163 in subversion

Timestamp:

Sep 5, 2011 4:06:52 AM (21 months ago)

Author:

thomasb

Message:

Use new host argument as mail_domain (#1488024)

File:

• trunk/plugins/new_user_identity/new_user_identity.php (modified) (5 diffs)

trunk/plugins/new_user_identity/new_user_identity.php

@@ -7 +7 @@
  * This plugin requires that a working public_ldap directory be configured.
  *
- * @version 1.02
+ * @version 1.05
  * @author Kris Steinhoff
  *
@@ -40 +40 @@
         $rcmail = rcmail::get_instance();
         
-        if ($this->init_ldap()) {
+        if ($this->init_ldap($args['host'])) {
             $results = $this->ldap->search('*', $args['user'], TRUE);
             if (count($results->records) == 1) {
@@ -55 +55 @@
     }
 
-    private function init_ldap()
+    private function init_ldap($host)
     {
         if ($this->ldap)
@@ -73 +73 @@
             $ldap_config[$addressbook],
             $rcmail->config->get('ldap_debug'),
-            $rcmail->config->mail_domain($_SESSION['imap_host']),
+            $rcmail->config->mail_domain($host),
             $match);
 
@@ -82 +82 @@
 class new_user_identity_ldap_backend extends rcube_ldap
 {
-    function __construct($p, $debug=false, $mail_domain=NULL, $search=null)
+    function __construct($p, $debug, $mail_domain, $search)
     {
         parent::__construct($p, $debug, $mail_domain);