steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.21, 1.22

cvs at intevation.de cvs at intevation.de
Sat Jun 11 01:54:39 CEST 2005


Author: steffen

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

Modified Files:
	index.php 
Log Message:
rewite from header (Issue783)

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- index.php	6 Jun 2005 23:47:05 -0000	1.21
+++ index.php	10 Jun 2005 23:54:37 -0000	1.22
@@ -49,6 +49,7 @@
   global $kolabhost;
   global $kolabfilterverifyfrom;
   global $kolabfilterallowsender;
+  global $kolabfilterrejectforgedfrom;
 
   // Get values from LDAP
   if (($result = ldap_read($ldap->connection, "k=kolab,".$_SESSION['base_dn'], '(objectclass=*)')) &&
@@ -82,6 +83,7 @@
 	unset( $kolabhost['count'] );
 	$kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0];
 	$kolabfilterallowsender = $attrs['kolabfilter-allow-sender-header'][0];
+	$kolabfilterrejectforgedfrom = $attrs['kolabfilter-reject-forged-from-header'][0];
 	ldap_free_result($result);
   }
 }
@@ -177,8 +179,9 @@
 
 if( $_REQUEST['submitkolabfilter'] ) {
   $attrs = array(
-				 'kolabfilter-verify-from-header'  => postvalue( 'kolabfilterverifyfrom' ),
-				 'kolabfilter-allow-sender-header' => postvalue( 'kolabfilterallowsender' ) );
+				 'kolabfilter-verify-from-header'        => postvalue( 'kolabfilterverifyfrom' ),
+				 'kolabfilter-allow-sender-header'       => postvalue( 'kolabfilterallowsender' ),
+				 'kolabfilter-reject-forged-from-header' => $_REQUEST['kolabfilterrejectforgedfrom']=='TRUE'?'TRUE':'FALSE' );
   if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
 	$errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
 	  .ldap_error($ldap->connection);
@@ -263,6 +266,7 @@
 $smarty->assign( 'postfixrelayhostmx', $postfixrelayhostmx );
 $smarty->assign( 'kolabfilterverifyfrom', toboolstr($kolabfilterverifyfrom) );
 $smarty->assign( 'kolabfilterallowsender', toboolstr($kolabfilterallowsender) );
+$smarty->assign( 'kolabfilterrejectforgedfrom', toboolstr($kolabfilterrejectforgedfrom) );
 $smarty->assign( 'kolabhost', $kolabhost );
 $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', 





More information about the commits mailing list