From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 10 Nov 2006 11:28:23 +0000 (+0000)
Subject: Fixed copy & paste for fax
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=903322aed37ced8458c1eb0d05c9ad84d792be0c;p=gosa.git

Fixed copy & paste for fax


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

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 5232ca844..11da486d0 100644
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -38,9 +38,12 @@ class gofaxAccount extends plugin
   var $out_blocklist_dialog= FALSE;
   var $current_blocklist= array();
 
+  /* Copy & paste variables */
+  var $CopyPasteVars=array("facsimileTelephoneNumber");
+
   /* attribute list for save action */
   var $attributes= array("goFaxDeliveryMode", "goFaxIsEnabled","goFaxRBlockgroups","facsimileAlternateTelephoneNumber",
-      "goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail");
+      "goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail","facsimileTelephoneNumber");
   var $objectclasses= array("goFaxAccount");
 
   var $uid= "";
@@ -734,11 +737,8 @@ class gofaxAccount extends plugin
       $this->attrs[$val]= $this->$val;
     }
 
-    /* Adapt mail settings if needed */
+    /* Do not save mail address ... it was possibly changed by mail plugin*/
     unset($this->attrs['mail']);
-    if (!$this->has_mailAccount && $this->goFaxDeliveryMode && 32){
-      $this->attrs['mail']= $this->mail;
-    }
 
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
diff --git a/plugins/gofax/faxaccount/paste_generic.tpl b/plugins/gofax/faxaccount/paste_generic.tpl
index 5a30bf774..769d90753 100644
--- a/plugins/gofax/faxaccount/paste_generic.tpl
+++ b/plugins/gofax/faxaccount/paste_generic.tpl
@@ -5,14 +5,19 @@
      		<table summary="">
        			<tr>
          			<td>
-						<label for="facsimileTelephoneNumber">{t}Fax{/t}</label>{$must}
-					</td>
-         			<td>
+					<label for="facsimileTelephoneNumber">{t}Fax{/t}</label>{$must}
+	           		</td>
+        			<td>
            				<input name="facsimileTelephoneNumber" id="facsimileTelephoneNumber" 
-							size=20 maxlength=65 value="{$facsimileTelephoneNumber}" 
+							size=40 maxlength=65 value="{$facsimileTelephoneNumber}" 
 							title="{t}Fax number for GOfax to trigger on{/t}">
          			</td>
        			</tr>
+			<tr>
+				<td colspan=2>
+					 {t}Alternate fax numbers will not be copied{/t}
+				</td>
+			</tr>
 			</table>
 		</td>
 	</tr>