summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-10-17 17:57:13 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-10-17 17:57:13 (GMT)
commit6525ec62d254c113c88ff4a166bbae711472a248 (patch)
treeb82d301f9448bac480ad24394fd17ef7f89e3a73
parentc67cb8759893abbd051bd3672ee5bdfe39909908 (diff)
downloadkolab-webadmin-6525ec62d254c113c88ff4a166bbae711472a248.tar.gz
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
-rw-r--r--ChangeLog5
-rwxr-xr-xphp/admin/templates/kolab.tpl1
-rw-r--r--www/admin/service/index.php.in6
3 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dedf60..1edac05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * php/admin/templates/kolab.tpl, www/admin/service/index.php.in:
+ kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
+
2007-08-07 Gunnar Wrobel <p@rdus.de>
* php/admin/templates/page.tpl.in:
diff --git a/php/admin/templates/kolab.tpl b/php/admin/templates/kolab.tpl
index 35df236..a33fc08 100755
--- a/php/admin/templates/kolab.tpl
+++ b/php/admin/templates/kolab.tpl
@@ -19,7 +19,6 @@
<li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server)"}</li>
<li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
<li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
-<!-- <li><a href="http://www.proftpd.org/">ProFTPD</a> {tr msg="(FTP Server)"}</li> -->
<li><a href="http://spamassassin.apache.org/">SpamAssasin</a> {tr msg="(SPAM Filter)"}</li>
</ul>
diff --git a/www/admin/service/index.php.in b/www/admin/service/index.php.in
index 2f02b74..0f0268f 100644
--- a/www/admin/service/index.php.in
+++ b/www/admin/service/index.php.in
@@ -35,7 +35,6 @@ function extract_ldap_values()
global $imap;
global $imaps;
global $sieve;
- global $ftp;
global $http;
global $httpallowunauthfb;
global $amavis;
@@ -61,7 +60,6 @@ function extract_ldap_values()
$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( $_REQUEST['submitservices'] ) {
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 @@ $entries = array( array( 'service' => 'pop3', 'name' => _('POP3 Service'), 'ena
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 ) ) );