thomas: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php.in, 1.4, 1.5
cvs at kolab.org
cvs at kolab.org
Wed Oct 17 19:57:15 CEST 2007
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service
In directory doto:/tmp/cvs-serv9800/kolab-webadmin/kolab-webadmin/www/admin/service
Modified Files:
index.php.in
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php.in 25 Jan 2007 10:33:42 -0000 1.4
+++ index.php.in 17 Oct 2007 17:57:13 -0000 1.5
@@ -35,7 +35,6 @@
global $imap;
global $imaps;
global $sieve;
- global $ftp;
global $http;
global $httpallowunauthfb;
global $amavis;
@@ -61,7 +60,6 @@
$imap = $attrs['cyrus-imap'][0];
$imaps = $attrs['cyrus-imaps'][0];
$sieve = $attrs['cyrus-sieve'][0];
- $ftp = $attrs['proftpd-ftp'][0];
$http = $attrs['apache-http'][0];
$httpallowunauthfb = $attrs['apache-allow-unauthenticated-fb'][0];
$amavis = $attrs['postfix-enable-virus-scan'][0];
@@ -123,7 +121,6 @@
if( postvalue( 'imap' ) != $imap ) $attrs['cyrus-imap'] = postvalue( 'imap' );
if( postvalue( 'imaps' ) != $imaps ) $attrs['cyrus-imaps'] = postvalue( 'imaps' );
if( postvalue( 'sieve' ) != $sieve ) $attrs['cyrus-sieve'] = postvalue( 'sieve' );
- if( postvalue( 'ftp' ) != $ftp ) $attrs['proftpd-ftp'] = postvalue( 'ftp' );
if( postvalue( 'http' ) != $http ) $attrs['apache-http'] = postvalue( 'http' );
if( postvalue( 'amavis' ) != $amavis ) $attrs['postfix-enable-virus-scan'] = postvalue( 'amavis' );
@@ -278,9 +275,6 @@
array( 'service' => 'imap', 'name' => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
- array( 'service' => 'ftp',
- 'name' => _('FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)'),
- 'enabled' => toboolstr( $ftp ) ),
array( 'service' => 'http', 'name' => _('HTTP FreeBusy Service (Legacy)'), 'enabled' => toboolstr( $http ) ),
array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'),
'enabled' => toboolstr( $amavis ) ) );
More information about the commits
mailing list