From 8fb2a8d168d1b75328b2571c15bb715ff109aa71 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 21 Mar 2008 13:58:24 +0000
Subject: Strip slashes from virtuser email values (#1484700)

git-svn-id: https://svn.roundcube.net/trunk@1202 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_user.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/program/include/rcube_user.inc b/roundcubemail/program/include/rcube_user.inc
index 41b424f1d..e748758a9 100644
--- a/roundcubemail/program/include/rcube_user.inc
+++ b/roundcubemail/program/include/rcube_user.inc
@@ -361,7 +361,7 @@ class rcube_user
 
     // try to resolve user in virtusertable
     if (!empty($CONFIG['virtuser_file']) && !strpos($user, '@'))
-      $user_email = self::user2email($user);
+      $user_email = rcube_user::user2email($user);
 
     $DB->query(
       "INSERT INTO ".get_table_name('users')."
@@ -468,7 +468,7 @@ class rcube_user
       $arr = preg_split('/\s+/', $data);
       if (count($arr) > 0)
       {
-        $email = trim($arr[0]);
+        $email = trim(str_replace('\\@', '@', $arr[0]));
         break;
       }
     }
-- 
cgit v1.2.3