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

cvs at intevation.de cvs at intevation.de
Wed Jun 15 13:11:45 CEST 2005


Author: steffen

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

Modified Files:
	service.tpl 
Log Message:
Attempt at explaining the weird ways of Issue783 (From rewrite)

Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- service.tpl	10 Jun 2005 23:54:37 -0000	1.4
+++ service.tpl	15 Jun 2005 11:11:43 -0000	1.5
@@ -114,9 +114,9 @@
 <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/>
+{tr msg="Reject the message with the except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient 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="Always 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>





More information about the commits mailing list