use idn_decode for mailuser and login fails for mail-users with IDN domains (Fixes #6021)

Author: florian030

interface/web/login/index.php

@@ -58,7 +58,7 @@
 if(count($_POST) > 0) {
 
 	//** Check variables
-	if(!preg_match("/^[\w\.\-\_\@]{1,128}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
+	if(!preg_match("/^[\w\.\-\_\@]{1,128}$/", $app->functions->idn_encode($_POST['username']))) $error = $app->lng('user_regex_error');
 	if(!preg_match("/^.{1,256}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');
 
 	//** importing variables
@@ -152,7 +152,7 @@
 				if(stristr($username, '@')) {
 					//* mailuser login
 					$sql = "SELECT * FROM mail_user WHERE login = ? or email = ?";
-					$mailuser = $app->db->queryOneRecord($sql, $username, $username);
+					$mailuser = $app->db->queryOneRecord($sql, $username, $app->functions->idn_encode($username));
 					$user = false;
 					if($mailuser) {
 						$saved_password = stripslashes($mailuser['password']);

interface/web/mailuser/index.php

@@ -5,7 +5,7 @@
 //* Check permissions for module
 $app->auth->check_module_permissions('mailuser');
 
-$app->uses('tpl');
+$app->uses('tpl, functions');
 
 $app->tpl->newTemplate('form.tpl.htm');
 $app->tpl->setInclude('content_tpl', 'templates/index.htm');
@@ -28,8 +28,10 @@
 
 if($rec['cc'] == '') $rec['cc'] = $wb['none_txt'];
 
-$app->tpl->setVar($rec);
+$rec['email'] = $app->functions->idn_decode($rec['email']);
+$rec['login'] = $app->functions->idn_decode($rec['login']);
 
+$app->tpl->setVar($rec);
 $sql2 = "SELECT * FROM server WHERE server_id = ?";
 $rec2 = $app->db->queryOneRecord($sql2, $rec['server_id']);
 

interface/web/mailuser/mail_user_cc_edit.php

@@ -75,7 +75,7 @@ function onShowEnd() {
 		global $app, $conf;
 
 		$rec = $app->tform->getDataRecord($this->id);
-		$app->tpl->setVar("email", $rec['email'], true);
+		$app->tpl->setVar("email", $app->functions->idn_decode($rec['email']), true);
 
 		parent::onShowEnd();
 	}

interface/web/mailuser/mail_user_password_edit.php

@@ -63,7 +63,7 @@ function onShowEnd() {
 		global $app, $conf;
 
 		$rec = $app->tform->getDataRecord($_SESSION['s']['user']['mailuser_id']);
-		$app->tpl->setVar("email", $rec['email'], true);
+		$app->tpl->setVar("email", $app->functions->idn_decode($rec['email']), true);
 
 		parent::onShowEnd();
 	}

interface/web/mailuser/mail_user_spamfilter_edit.php

@@ -112,7 +112,7 @@ function onShowEnd() {
 		global $app, $conf;
 
 		$rec = $app->tform->getDataRecord($this->id);
-		$app->tpl->setVar("email", $rec['email'], true);
+		$app->tpl->setVar("email", $app->functions->idn_decode($rec['email']), true);
 
 		// Get the spamfilter policys for the user
 		$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = ?", $rec['email']);