Updated groupMail

-Added checkbox to toggle local delivery, Updated template && added ACLs

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 3fcc5d63d5e293c40347fa653c74bfce22565c96..05674901e0d6dbc63d705653779ccff323252b47 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -72,6 +72,7 @@ $ACLD['mailgroup']=  array(
                        "mail",
                        "gosaMailAlternateAddress",
                        "gosaMailForwardingAddress",
+                       "gosaMailDeliveryModeI",
                        "gosaMailQuota",
                        "gosaMailServer");
 $ACLD['terminal']=   array("gotoAdaptPath",

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index ab86f0fb3a8e43fb4676eda62f5e43c091830f22..089369ecae3862fea3cf785e565fac798231fbd9 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -39,6 +39,7 @@ class mailgroup extends plugin
   var $gosaMailMaxSize            = "";       // 
   
   var $remove_folder_from_imap    = true;
+  var $only_local =""; // Dummy var used to assign ACLs.
 
   /* Helper */
   var $indexed_acl= array();
@@ -543,6 +544,7 @@ class mailgroup extends plugin
         $smarty->assign("$type", $gmailfilter[$type]);
       }
       $smarty->assign("hint", print_sizelimit_warning());
+
       $display.= $smarty->fetch (get_template_path('mail_locals.tpl', TRUE));
       return ($display);
     }
@@ -595,7 +597,7 @@ class mailgroup extends plugin
       $mailserver[]= $key;
     }
     $smarty->assign("mailServers", $mailserver);
-    foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail",
+    foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail","only_local",
           "gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){
       $smarty->assign("$val", $this->$val);
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
@@ -629,6 +631,11 @@ class mailgroup extends plugin
       $smarty->assign("kolab", FALSE);
     }
 
+    if (preg_match("/I/", $this->gosaMailDeliveryMode)) {
+      $smarty->assign("only_local", "checked");
+    }else{
+      $smarty->assign("only_local", "");
+    }
 
     $display.= $smarty->fetch (get_template_path('mail.tpl', TRUE));
     return ($display);

diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl
index ffbcc3e2299d3a708ee4ef91b9a45d0e3542ed5c..eb400a9c5deb0dec9fa2711632216c8557e4d0cd 100644 (file)
--- a/plugins/admin/groups/mail.tpl
+++ b/plugins/admin/groups/mail.tpl
@@ -100,6 +100,18 @@
     </tr>
        {$plusattributes}
    </table>
+<p class="seperator">&nbsp;</p>
+
+<h2><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Advanced mail options{/t}</h2> 
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="2" border="0">
+ <tr>
+  <td>
+   <input type="checkbox" name="only_local" value="1" {$only_local} {$only_localACL} 
+       title="{t}Select if user can only send and receive inside his own domain{/t}">
+       {t}User is only allowed to send and receive local mails{/t}
+  </td> 
+ </tr>
+ </table> 
       
   </td>
   <td style="vertical-align:top;width:50%">