From f839e28432984c869793b720f3542091a6b0c88d Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 22 Apr 2010 15:58:26 +0000 Subject: [PATCH] Updated the fax check method - mail wasn't checked correctly git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17802 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc index 6c46f1123..51451f089 100644 --- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc +++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc @@ -626,10 +626,9 @@ class gofaxAccount extends plugin $message[]= msgPool::invalid(_("Fax number"),$this->facsimileTelephoneNumber,"/[0-9]/"); } - /* IF mail is specified (which is only the case if there's no mail account - present), check if it's valid.. */ - if (@isset($this->parent->by_object['mailAccount']) && - $this->goFaxDeliveryMode & 32){ + // check for a valid Mail-Address in case of 'delivery to mailbox' + $mailAccount = (isset($this->parent->by_object['mailAccount']) && $this->parent->by_object['mailAccount']->is_account); + if(!$mailAccount && $this->goFaxDeliveryMode & 32){ if ($this->mail == ""){ $message[]= _("Mail delivery is requested without target address!"); } elseif (!tests::is_email($this->mail)){ -- 2.30.2