From 59db17b82319211835b8c24937c7d8c166f4a2b9 Mon Sep 17 00:00:00 2001
From: vbenincasa <vbenincasa@gmail.com>
Date: Thu, 03 May 2012 07:02:50 -0400
Subject: [PATCH] - Fix the idn_convert() function call that was preventing the login with the "%s" replacement variable in config.
---
program/include/rcube_utils.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index 663adb6..37fc3fc 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
+-----------------------------------------------------------------------+
@@ -628,7 +628,7 @@
// %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;
--
Gitblit v1.9.1