Added a seperate ACL fot vacation start stop

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index b1fffa398ddcffc208267bb7c5cba03eea7fd84c..6a5975cc4a53772eacc04cf9de89b86908aef67b 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -254,7 +254,9 @@ $ACLD['mailAccount']=       array(
                        "gosaMailServer",
                        "gosaSpamMailbox",
                        "gosaSpamSortLevel",
-                       "gosaVacationMessage",
+                       "use_vacation"                  => _("Enable vacation message"),
+                       "gosaVacationMessage"   => _("Vacation message"),
+                       "gosaVacationTimer"             => _("Vacation start/stop"),
                        "sieveManagement",
                         "drop_own_mails",
                        "mail",

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 8484608df6e46c8a374d1ec5c4c51003113a0aa7..fe0058d092c4b5b1bac3144e568892adb1b498d9 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -620,7 +620,9 @@ class mailAccount extends plugin
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
 
-    $smarty->assign("sieveManagementACL", chkacl($this->acl,"sieveManagement"));
+    $smarty->assign("use_vacationACL",      chkacl($this->acl,"use_vacation"));
+    $smarty->assign("gosaVacationTimerACL", chkacl($this->acl,"gosaVacationTimer"));
+    $smarty->assign("sieveManagementACL",   chkacl($this->acl,"sieveManagement"));
 
     if (preg_match('/V/', $this->gosaMailDeliveryMode)){
       $smarty->assign('rangeEnabled', "");
@@ -810,7 +812,7 @@ class mailAccount extends plugin
       $tmp= "";
       $Flags = array(
                      "R"  => array("ACL" => "gosaMailMaxSize",    "POST" => "use_mailsize_limit"),
-                     "V"  => array("ACL" => "gosaVacationMessage","POST" => "use_vacation"),
+                     "V"  => array("ACL" => "use_vacation",       "POST" => "use_vacation"),
                      "C"  => array("ACL" => "custom_sieve",       "POST" => "own_script"),
                      "I"  => array("ACL" => "only_local",         "POST" => "only_local"));
 
@@ -860,7 +862,7 @@ class mailAccount extends plugin
       }
       $this->gosaMailDeliveryMode= $tmp;
 
-      if(chkacl($this->acl,"gosaVacationMessage") == "" && preg_match("/V/",$this->gosaMailDeliveryMode)){
+      if(chkacl($this->acl,"gosaVacationTimer") == "" && preg_match("/V/",$this->gosaMailDeliveryMode)){
         if(isset($_POST['gosaVacationStart'])){
           $this->gosaVacationStart = $_POST['gosaVacationStart'];
         }

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index 76c4107f0c6b3fd064c20b378750cf6c23d01b61..d19763f6353119c52e6b0ef391266939d62d3821 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -111,8 +111,22 @@
    <input {if $own_script != ""} disabled {/if} type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} id="drop_own_mails"
        {$drop_own_mailsACL} title="{t}Select if you want to forward mails without getting own copies of them{/t}"> {t}No delivery to own mailbox{/t}
    <br>
-   <input type=checkbox {if $own_script != ""} disabled {/if} name="use_vacation" value="1" {$use_vacation} id="use_vacation"
-       {$gosaVacationMessageACL} title="{t}Select to automatically response with the vacation message defined below{/t}"  onclick="changeState('day'); changeState('month'); changeState('year'); changeState('sday'); changeState('smonth'); changeState('syear');"> {t}Activate vacation message{/t}
+   <input type=checkbox 
+               {if $own_script != ""} disabled {/if} 
+                       {$use_vacationACL} 
+                       name="use_vacation" value="1" {$use_vacation} id="use_vacation"
+                       title="{t}Select to automatically response with the vacation message defined below{/t}"  
+
+               {if $gosaVacationTimerACL == ""}
+                       onclick="       changeState('day'); 
+                                               changeState('month'); 
+                                               changeState('year'); 
+                                               changeState('sday'); 
+                                               changeState('smonth'); 
+                                               changeState('syear');"
+               {/if}
+         >
+        {t}Activate vacation message{/t}
    <br>
    <div style="padding-left:22px;">
        <table>
@@ -121,13 +135,13 @@
        {t}from{/t}
           </td>
           <td>
-       <select {if $own_script != ""} disabled {/if} name=day id="day" onChange="createResult(this.form,this.form.gosaVacationStart);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=day id="day" onChange="createResult(this.form,this.form.gosaVacationStart);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options values=$days output=$days selected=$start_day}
        </select>
-       <select {if $own_script != ""} disabled {/if} name=month id="month" onChange="populate(this.form,this.form.gosaVacationStart);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=month id="month" onChange="populate(this.form,this.form.gosaVacationStart);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options options=$months selected=$start_month}
        </select>
-       <select {if $own_script != ""} disabled {/if} name=year id="year" onChange="populate(this.form,this.form.gosaVacationStart);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=year id="year" onChange="populate(this.form,this.form.gosaVacationStart);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options values=$years output=$years selected=$start_year}
        </select>
        <input type="hidden" name="gosaVacationStart" value="{$gosaVacationStart}">
@@ -138,13 +152,13 @@
        {t}till{/t}
           </td>
           <td>
-       <select {if $own_script != ""} disabled {/if} name=sday id="sday" onChange="createResult2(this.form,this.form.gosaVacationStop);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=sday id="sday" onChange="createResult2(this.form,this.form.gosaVacationStop);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options values=$days output=$days selected=$end_day}
        </select>
-       <select {if $own_script != ""} disabled {/if} name=smonth id="smonth" onChange="populate2(this.form,this.form.gosaVacationStop);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=smonth id="smonth" onChange="populate2(this.form,this.form.gosaVacationStop);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options options=$months selected=$end_month}
        </select>
-       <select {if $own_script != ""} disabled {/if} name=syear id="syear" onChange="populate2(this.form,this.form.gosaVacationStop);" {$gosaVacationMessageACL} {$rangeEnabled}>
+       <select {if $own_script != ""} disabled {/if} name=syear id="syear" onChange="populate2(this.form,this.form.gosaVacationStop);" {$gosaVacationTimerACL} {$rangeEnabled}>
                {html_options values=$years output=$years selected=$end_year}
        </select>
        <input type="hidden" name="gosaVacationStop" value="{$gosaVacationStop}">