steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.22, 1.22.2.1
cvs at intevation.de
cvs at intevation.de
Mon Oct 3 03:17:02 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service
In directory doto:/tmp/cvs-serv26134/kolab-webadmin/www/admin/service
Modified Files:
Tag: kolab_2_0_branch
index.php
Log Message:
update webgui for new postfix relayhost
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- index.php 10 Jun 2005 23:54:37 -0000 1.22
+++ index.php 3 Oct 2005 01:17:00 -0000 1.22.2.1
@@ -45,7 +45,7 @@
global $postfixmynetworks;
global $postfixallowunauth;
global $postfixrelayhost;
- global $postfixrelayhostmx;
+ global $postfixrelayport;
global $kolabhost;
global $kolabfilterverifyfrom;
global $kolabfilterallowsender;
@@ -71,14 +71,7 @@
$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];
$postfixrelayhost = $attrs['postfix-relayhost'][0];
- if( ereg( '\\[(.+)\\]', $postfixrelayhost, $regs ) ) {
- $postfixrelayhost = $regs[1];
- $postfixrelayhostmx = 'false';
- } else if( $postfixrelayhost != '' ) {
- $postfixrelayhostmx = 'true';
- } else {
- $postfixrelayhostmx = 'false';
- }
+ $postfixrelayport = $attrs['postfix-relayport'][0];
$kolabhost = $attrs['kolabHost'];
unset( $kolabhost['count'] );
$kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0];
@@ -189,13 +182,13 @@
}
if( $_REQUEST['submitpostfixrelayhost'] ) {
- $value = trim( $_REQUEST['postfixrelayhost'] );
- if( $value != '' && !isset( $_REQUEST['postfixrelayhostmx'] ) ) {
- $value = "[$value]";
- }
- if( $value == '' ) $value = array();
- $attrs = array();
- $attrs['postfix-relayhost'] = $value;
+ $host_val = trim( $_REQUEST['postfixrelayhost'] );
+ $porr_val = trim( $_REQUEST['postfixrelayport'] );
+ if( $host_val == '' ) $host_val = array();
+ if( $port_val == '' ) $port_val = array();
+ $attrs = array();
+ $attrs['postfix-relayhost'] = $host_val;
+ $attrs['postfix-relayport'] = $port_val;
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,7 +256,7 @@
$smarty->assign( 'postfixmynetworks', $postfixmynetworks );
$smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) );
$smarty->assign( 'postfixrelayhost', $postfixrelayhost );
-$smarty->assign( 'postfixrelayhostmx', $postfixrelayhostmx );
+$smarty->assign( 'postfixrelayport', $postfixrelayport );
$smarty->assign( 'kolabfilterverifyfrom', toboolstr($kolabfilterverifyfrom) );
$smarty->assign( 'kolabfilterallowsender', toboolstr($kolabfilterallowsender) );
$smarty->assign( 'kolabfilterrejectforgedfrom', toboolstr($kolabfilterrejectforgedfrom) );
More information about the commits
mailing list