summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornetbit <netbit@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-05-03 11:02:50 +0000
committernetbit <netbit@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-05-03 11:02:50 +0000
commitfc45a95ad490507de97053fc1ef2c016d22d3ad3 (patch)
treef49b85a03b6dbcfbd0b1ef92dd8f86d79823b312
parent0bbf093fe264d3fcebdab507723fd413dd9b01d0 (diff)
- Fix the idn_convert() function call that was preventing the login with the "%s" replacement variable in config.
git-svn-id: https://svn.roundcube.net/trunk@6140 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_utils.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_utils.php b/roundcubemail/program/include/rcube_utils.php
index 663adb68e..37fc3fc33 100644
--- a/roundcubemail/program/include/rcube_utils.php
+++ b/roundcubemail/program/include/rcube_utils.php
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
+-----------------------------------------------------------------------+
@@ -628,7 +628,7 @@ class rcube_utils
// %s - domain name after the '@' from e-mail address provided at login screen. Returns FALSE if an invalid email is provided
if (strpos($name, '%s') !== false) {
$user_email = self::get_input_value('_user', self::INPUT_POST);
- $user_email = rcube_idn_convert($user_email, true);
+ $user_email = rcube_utils::idn_convert($user_email, true);
$matches = preg_match('/(.*)@([a-z0-9\.\-\[\]\:]+)/i', $user_email, $s);
if ($matches < 1 || filter_var($s[1]."@".$s[2], FILTER_VALIDATE_EMAIL) === false) {
return false;