summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a6c422)
raw | patch | inline | side by side (parent: 1a6c422)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 24 Mar 2010 15:08:56 +0000 (15:08 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 24 Mar 2010 15:08:56 +0000 (15:08 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17129 594d385d-05f5-0310-b6e9-bd551577e9d8
gosa-plugins/mail/admin/groups/mail/class_groupMail.inc | patch | blob | history | |
gosa-plugins/mail/admin/groups/mail/mail.tpl | patch | blob | history |
diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 3b3732f77d8033fc3521f7a4912c93db573871ed..10ca8c0216d5997bf65a4cc80726c35d084fc74b 100644 (file)
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{
}
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])){
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");
{
$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 ae770db2d9fd9f46a7385cad4cecd4d8c1b650e6..605521cd233b6491be3da3034d114927028c88b3 100644 (file)
<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>
</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>