Part 2 trunk update

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

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 69dc4acab29417b2f56d03483df8ea52b800acab..7e9f5e9fe36140c4aaabed2b1b75979627873632 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -38,11 +38,15 @@ class gofaxAccount extends plugin
   var $out_blocklist_dialog= FALSE;
   var $current_blocklist= array();
 
-  var $uid ="";
+  /* Copy & paste variables */
+  var $CopyPasteVars=array("facsimileTelephoneNumber","goFaxRBlocklist","goFaxRBlockgroups","goFaxSBlocklist","goFaxSBlockgroups");
 
   /* attribute list for save action */
-  var $attributes= array("goFaxDeliveryMode", "goFaxIsEnabled","goFaxRBlockgroups","facsimileAlternateTelephoneNumber","facsimileTelephoneNumber",
-      "goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail");
+  var $attributes= array("goFaxDeliveryMode", "goFaxIsEnabled","facsimileAlternateTelephoneNumber",
+      "goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail","facsimileTelephoneNumber");
+
+  var $uid ="";
+
   var $objectclasses= array("goFaxAccount");
 
   function gofaxAccount ($config, $dn= NULL)
@@ -726,11 +730,8 @@ class gofaxAccount extends plugin
       $this->attrs['goFaxDeliveryMode'] = 0;
     }
   
-    /* 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 5a30bf7743bf7894061f4116be9ce62d743f1425..fc24dc4ba2f5c03bb4db2d02417d52c3f0350a58 100644 (file)
--- a/plugins/gofax/faxaccount/paste_generic.tpl
+++ b/plugins/gofax/faxaccount/paste_generic.tpl
@@ -5,14 +5,20 @@
                <table summary="">
                                <tr>
                                <td>
-                                               <label for="facsimileTelephoneNumber">{t}Fax{/t}</label>{$must}
-                                       </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>

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index ace7564f796571c56284555e3b30d727acd8b493..4c4749c6e410f07ae7351bc4aeb7812eceb6a581 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -34,7 +34,9 @@ class phoneAccount extends plugin
   var $cli_parameters         = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
 
   /* attribute list for save action */
-  var $CopyPasteVars          = array("phoneNumbers");
+  var $CopyPasteVars          = array("phoneNumbers","macroarray","macrostillavailable"/*"phoneNumbers" -Reset- */,
+                                      "hardware_list","used_hardware");
+
   var $attributes             = array("goFonDeliveryMode", "goFonFormat","uid","cn",
                                       "goFonHardware","goFonPIN","goFonVoicemailPIN",
                                       "telephoneNumber", "goFonMacro","macro");

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index edd020dcb8d85e67e409980af1ca80ea9fd8c6cc..adcca5c97e7622f28844cc6390e484ade7149850 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -301,7 +301,7 @@ class kolabAccount extends plugin
     }
 
     /* Check for URL scheme... */
-    if(!empty($this->calFBURL) && !preg_match("/(https|https):\/\//",$this->calFBURL)){
+    if(!empty($this->calFBURL) && !preg_match("/http+(s)*:\/\//",$this->calFBURL)){
       $message[]= _("The value specified as Free Busy Information URL is invalid.");
     }
 

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 38d878ecbdb2bbdfcc00271c363cfdeb77e8e6db..dac07f8d672c29473fc29ff81e62e7f3e37a846b 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -809,8 +809,7 @@ class oxchangeAccount extends plugin
     preg_match("/^(\w+(?=\=))=((\w|\s|\.)+(?=\,)),.*/",$this->dn,$uidarray);
     $uid=$uidarray[2];
     if (trim($uid) == "") {
-      print_red(_("The Open-Xchange accountname is empty and thus invalid! Check to make sure that ".
-                  "you are not using any strange characters in the loginname."));
+      print_red(_("The Open-Xchange accountname is empty and thus invalid! Check to make sure that you are not using any strange characters in the loginname."));
       return;
     }
        

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index e1914d1511eb65e02149bf06b0827a260ade8d95..bd39ed60da2c107e6d9a88a81c750415ac0f0c8c 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -14,8 +14,9 @@ class proxyAccount extends plugin
   var $gosaProxyQuotaPeriod= "m";
 
   /* attribute list for save action */
-  var $attributes= array("gosaProxyID", "gosaProxyAcctFlags", "gosaProxyWorkingStart",
-      "gosaProxyWorkingStop", "gosaProxyQuota", "gosaProxyQuotaPeriod");
+  var $attributes= array(   "gosaProxyID", "gosaProxyAcctFlags", "gosaProxyWorkingStart",
+                            "gosaProxyWorkingStop", "gosaProxyQuota", "gosaProxyQuotaPeriod");
+
   var $objectclasses= array("gosaProxyAccount");
   var $ReadOnly = false;
 
@@ -34,8 +35,8 @@ class proxyAccount extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-//     plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     $display= "";