From 3064f83f0096d8078ce04af37374d2188f886a5d Mon Sep 17 00:00:00 2001 From: mcramer Date: Thu, 13 Sep 2012 15:05:02 +0000 Subject: [PATCH] Fixed: login (if enabled) for email address should be set to mail address if not provided in form --- interface/web/mail/mail_user_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index cfb6592a2..36e2858f7 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -207,7 +207,7 @@ class page_action extends tform_actions { $sys_config = $app->getconf->get_global_config('mail'); if($sys_config["enable_custom_login"] == "y") { - if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"]; + if(!isset($_POST["login"]) || $_POST["login"] == '') $this->dataRecord["login"] = $this->dataRecord["email"]; elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."
"; } else { $this->dataRecord["login"] = isset($this->dataRecord["email"]) ? $this->dataRecord["email"] : ''; -- GitLab