diff options
| author | thomascube <thomas@roundcube.net> | 2011-09-05 08:05:40 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-09-05 08:05:40 +0000 |
| commit | 94a5a24fc2a8040b22d4012773ebb6879957cfdf (patch) | |
| tree | c57813c6898d1328782af06c740bb4a0059c245f | |
| parent | 4c4fe693d7d3e892e28fb99bd6f1cc65a3e66ccc (diff) | |
Fallback to mail_domain in LDAP variable replacements; add 'host' to 'user_create' hook arguments (#1488024)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 7 | ||||
| -rw-r--r-- | program/include/rcube_user.php | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fallback to mail_domain in LDAP variable replacements; add 'host' to 'user_create' hook arguments (#1488024) - Fixed wrong vCard type parameter mobile (#1488067) - Fixed vCard WORKFAX issue (#1488046) - Add vCard's Profile URL support (#1488062) diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index bf978a7ff..699691d87 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -181,8 +181,11 @@ class rcube_ldap extends rcube_addressbook } // Get the pieces needed for variable replacement. - $fu = $RCMAIL->user->get_username(); - list($u, $d) = explode('@', $fu); + if ($fu = $RCMAIL->user->get_username()) + list($u, $d) = explode('@', $fu); + else + $d = $this->mail_domain; + $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u); diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index d2bbaa176..dc5767d14 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -437,7 +437,7 @@ class rcube_user } $data = $rcmail->plugins->exec_hook('user_create', - array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email)); + array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email, 'host'=>$host)); // plugin aborted this operation if ($data['abort']) |