#1485207

16 years ago · e2003306d3
parent 6c26fb42aa
commit e2003306d3
1 changed files with 3 additions and 3 deletions
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@ -420,11 +420,11 @@ class rcube_user
  static function email2user($email)
  {
    $user = $email;
-    $r = self::findinvirtual("^$email");
+    $r = self::findinvirtual("^$email\s");

    for ($i=0; $i<count($r); $i++)
    {
-      $data = $r[$i];
+      $data = trim($r[$i]);
      $arr = preg_split('/\s+/', $data);
      if (count($arr) > 0)
      {
@ -446,7 +446,7 @@ class rcube_user
  static function user2email($user)
  {
    $email = "";
-    $r = self::findinvirtual("$user$");
+    $r = self::findinvirtual("\s$user\s*$");

    for ($i=0; $i<count($r); $i++)
    {