steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates service.tpl, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv1169/kolab-webadmin/kolab-webadmin/php/admin/templates

Modified Files:
	service.tpl 
Log Message:
rewite from header (Issue783)

Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- service.tpl	6 Jun 2005 23:47:05 -0000	1.3
+++ service.tpl	10 Jun 2005 23:54:37 -0000	1.4
@@ -107,10 +107,17 @@
 <div class="contentform">
 <form name="kolabfilterform" method="post">
 <input type="checkbox" name="kolabfilterverifyfrom" {if $kolabfilterverifyfrom == 'true' }checked{/if} />
-{tr msg="Only allow mail with a trustable From header for accounts on this server. Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to happen for example with mailinglists."}
+{tr msg="Check messages for mismatching From header and envelope from."}
 <br />
 <input type="checkbox" name="kolabfilterallowsender" {if $kolabfilterallowsender == 'true' }checked{/if} />
-{tr msg="Use the Sender header instead of From for the above checks if present."}
+{tr msg="Use the Sender header instead of From for the above checks if Sender is present."}
+<br />
+<h4>Action to take for messages that fail the check:</h4>
+<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
+{tr msg="Modify the From header so the user can see the potential forgery."}<br/>
+<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
+{tr msg="Reject the message."}
+{tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
 <br />
 <div align="right"><input type="submit" name="submitkolabfilter" value="{tr msg="Update"}" /></div>
 </form>