From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 13 Sep 2010 09:52:46 +0000 (+0000)
Subject: added comparison for primary Addresss to forward and alternate Addresses in the FE.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=871dcfdf6c88cfd47a0db22127154910d303dfa5;p=gosa.git

added comparison for primary Addresss to forward and alternate Addresses in the FE.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19619 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index 26b4d0d63..430e3a904 100644
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -742,7 +742,12 @@ class groupware extends plugin
 		if(isset($this->forwardingAddresses) && is_array($this->forwardingAddresses)){
 			foreach($this->forwardingAddresses as $fAddress){
 				if(!tests::is_email ($fAddress)){
-					$messages[] = msgPool::invalid(_("Mail address"),$fAddress, "", _("Example: user@excom.intranet.gonicus.de"));
+					$messages[] = msgPool::invalid(_("Mail address"),$fAddress, "", 
+						_("Example: user@excom.intranet.gonicus.de"));
+				}
+				if($fAddress == $this->mailAddress){
+					$messages[] = msgPool::invalid(_("Mail address same as primary Email Address"),$fAddress, "",
+						 _("Forward Address and primary Email Address must not be the same (cirle reference)"));
 				}
 			}
 		}
@@ -751,6 +756,10 @@ class groupware extends plugin
 				if(!tests::is_email ($fAddress)){
 					$messages[] = msgPool::invalid(_("Mail address"),$fAddress, "", _("Example: user@excom.intranet.gonicus.de"));
 				}
+				if($fAddress == $this->mailAddress){
+					$messages[] = msgPool::invalid(_("Mail address same as primary Email Address"),$fAddress, "",
+						 _("Alternative Address and primary Email Address must not be the same (cirle reference)"));
+				}
 			}
 		}