From e59023b1a9eb1baf891e826b75a9741cbf7e4c86 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Tue, 17 May 2011 16:02:31 +0000
Subject: [PATCH] allow mail address with name part for password reset FROM
 address

---
 lam/lib/account.inc | 3 +++
 lam/lib/config.inc  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index 5a83b63c..26d21a6b 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -413,6 +413,9 @@ function get_preg($argument, $regexp) {
 		case "email":
 					$pregexpr = '/^([0-9a-zA-Z+\\/\\._-])+[@]([0-9a-zA-Z-])+([.]([0-9a-zA-Z-])+)*$/';
 					break;
+		case "emailWithName":
+					$pregexpr = '/^([[:alnum:] ])+ <([0-9a-zA-Z+\\/\\._-])+[@]([0-9a-zA-Z-])+([.]([0-9a-zA-Z-])+)*>$/u';
+					break;
 		case "mailLocalAddress":
 					$pregexpr = '/^([0-9a-zA-Z+\\/\\._-])+([@]([0-9a-zA-Z-])+([.]([0-9a-zA-Z-])+)*)?$/';
 					break;
diff --git a/lam/lib/config.inc b/lam/lib/config.inc
index 4a2ffdcd..476ff255 100644
--- a/lam/lib/config.inc
+++ b/lam/lib/config.inc
@@ -1048,7 +1048,7 @@ class LAMConfig {
 	 */
 	public function setLamProMailFrom($lamProMailFrom) {
 		$this->lamProMailFrom = $lamProMailFrom;
-		if (($lamProMailFrom != '') && !get_preg($lamProMailFrom, 'email')) {
+		if (($lamProMailFrom != '') && !get_preg($lamProMailFrom, 'email') && !get_preg($lamProMailFrom, 'emailWithName')) {
 			return false;
 		}
 		return true;