From 4e3bb0ea868c1446c09dba6fb214b7831f7282e2 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 24 Mar 2010 15:08:56 +0000
Subject: [PATCH] Updated Mail Plugin to be w3c conform

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17129 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/groups/mail/class_groupMail.inc     | 23 ++++++++++---------
 gosa-plugins/mail/admin/groups/mail/mail.tpl  |  8 ++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 3b3732f77..10ca8c021 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -645,7 +645,7 @@ class mailgroup extends plugin
       if(isset($_POST['mail_acls_posted'])){
         $new_acls = array();
         foreach(array("__anyone__","__member__") as $attr){
-          $pname = base64_encode($attr);
+          $pname = postEncode($attr);
           if(get_post('acl_value_'.$pname)){ 
             $new_acls[$attr] = get_post('acl_value_'.$pname);
           }else{
@@ -654,7 +654,7 @@ class mailgroup extends plugin
         }
 
         foreach($this->folder_acls as $user => $acl){
-          $pname = base64_encode($user);
+          $pname = postEncode($user);
           if($user == "__member__" || $user == "__anyone__") continue;
           if(isset($_POST['remove_acl_user_'.$pname])){
           }elseif(isset($_POST['acl_user_'.$pname])){
@@ -688,14 +688,15 @@ class mailgroup extends plugin
        V - Use vacation message
        C - Use custom sieve script
        I - Only insider delivery */
-      $tmp= preg_replace("/[^a-z]/i","",$this->gosaMailDeliveryMode);
-      if($this->acl_is_writeable("gosaMailDeliveryModeL")){
-        if(!preg_match("/L/",$tmp) && !isset($_POST['drop_own_mails'])){
-          $tmp.="L";
-        }elseif(preg_match("/L/",$tmp) && isset($_POST['drop_own_mails'])){
-          $tmp = preg_replace("/L/","",$tmp);
-        }
-      }
+     $tmp= preg_replace("/[^a-z]/i","",$this->gosaMailDeliveryMode);
+
+#     if($this->acl_is_writeable("gosaMailDeliveryModeL")){
+#       if(!preg_match("/L/",$tmp) && !isset($_POST['drop_own_mails'])){
+#         $tmp.="L";
+#       }elseif(preg_match("/L/",$tmp) && isset($_POST['drop_own_mails'])){
+#         $tmp = preg_replace("/L/","",$tmp);
+#       }
+#     }
 
       $opts = array(
           "I"   => "only_local");
@@ -1204,7 +1205,7 @@ class mailgroup extends plugin
   {
     $ret = array();
     foreach($this->folder_acls as $name => $acl){
-      $ret[$name] = array("name" => $name,"acl" => $acl,"post_name" => base64_encode($name));
+      $ret[$name] = array("name" => $name,"acl" => $acl,"post_name" => postEncode($name));
     }
     return($ret);
   }
diff --git a/gosa-plugins/mail/admin/groups/mail/mail.tpl b/gosa-plugins/mail/admin/groups/mail/mail.tpl
index ae770db2d..605521cd2 100644
--- a/gosa-plugins/mail/admin/groups/mail/mail.tpl
+++ b/gosa-plugins/mail/admin/groups/mail/mail.tpl
@@ -153,7 +153,7 @@
      		<td><LABEL for="member_permissions">{t}Member permission{/t}</LABEL></td>
 		{else}
      		<td>
-				<input type='input' name='acl_user_{$item.post_name}' value='{$user}'>
+				<input type='text' name='acl_user_{$item.post_name}' value='{$user}'>
 			</td>
 		{/if}
 		 <td>
@@ -213,11 +213,7 @@
   </td>
   <td style='width:50%'>
 
-   <h3>
-	{image path="plugins/mail/images/envelope.png"}
-
-	{t}Forward messages to non group members{/t}
-   </h3>
+   <h3>{t}Forward messages to non group members{/t}</h3>
 
 {render acl=$gosaMailForwardingAddressACL}
    <select style="width:100%;" name="forwarder_list[]" size=10 multiple>
-- 
2.30.2