From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 30 Nov 2006 07:05:33 +0000 (+0000)
Subject: Fixed check for delivery flag, use binary operator instead of boolean.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f69e9524ede92f61d55410c588eda62aba44a91;p=gosa.git

Fixed check for delivery flag, use binary operator instead of boolean.
Added goFaxPrinter to the list of available printer, to avoid data loss caused by missing read acls


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

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 14e6bb223..1b1b26b44 100644
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -89,6 +89,13 @@ class gofaxAccount extends plugin
       asort ($this->printerList);
     }
 
+    /* Check if the currently selected printer is still available. 
+       If not, append current printer to list of available.
+       It could be possible, that we are not allowed to view printers and so the list is empty ...  */
+    if(!empty($this->goFaxPrinter) && !isset($this->printerList[$this->goFaxPrinter])) {
+      $this->printerList[$this->goFaxPrinter] = "[".$this->goFaxPrinter."]";
+    }
+
     /* Get global filter config */
     if (!is_global("faxfilter")){
       $ui= get_userinfo();
@@ -639,7 +646,7 @@ class gofaxAccount extends plugin
     /* 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){
+        $this->goFaxDeliveryMode & 32){
       if ($this->mail == ""){
         $message[]= _("Mail delivery is checked, but no address has been specified.");
       } elseif (!is_email($this->mail)){