summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Konold <martin.konold@erfrakon.de>2007-01-24 17:47:30 (GMT)
committerMartin Konold <martin.konold@erfrakon.de>2007-01-24 17:47:30 (GMT)
commit92100f0beda66aa50eb9d748db9be5a24a9600b6 (patch)
treeec88a63dceb8bf242ada556d35cc27ac27bbbe15
parent1db2d5553ac6e87519c497bcfc950b5d7d44b9b9 (diff)
downloadkolab-webadmin-92100f0beda66aa50eb9d748db9be5a24a9600b6.tar.gz
Martin K.. Fix issue #1551. Using patch from Jørgen H. Fjeld
-rwxr-xr-xphp/admin/templates/service.tpl2
-rw-r--r--www/admin/index.php.in2
-rw-r--r--www/admin/service/index.php.in4
3 files changed, 4 insertions, 4 deletions
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index 0a0c085..ed2ff96 100755
--- a/php/admin/templates/service.tpl
+++ b/php/admin/templates/service.tpl
@@ -10,7 +10,7 @@
<a name="systemaliasconf"></a>
<h2>{tr msg="Administrative email addresses"}</h2>
<div class="contentsimple">
-<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster@yourdomain.tld, postmaster@yourdomain.tld, MAILER-DAEMON@yourdomain.tld, abuse@yourdomain.tld and virusalert@yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
+<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster@yourdomain.tld, postmaster@yourdomain.tld, mailer-daemon@yourdomain.tld, abuse@yourdomain.tld and virusalert@yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
{section name=id loop=$systemaliasconf}
<div class="contentform">
<form name="systemalias_{$systemaliasconf[id].n}" method="post">
diff --git a/www/admin/index.php.in b/www/admin/index.php.in
index 4ec30d3..fe2808d 100644
--- a/www/admin/index.php.in
+++ b/www/admin/index.php.in
@@ -43,7 +43,7 @@ if( $auth->group() == 'admin' ) {
!exists_group( 'postmaster@'.$domain ) ||
!exists_group( 'abuse@'.$domain ) ||
!exists_group( 'virusalert@'.$domain ) ||
- !exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+ !exists_group( 'mailer-daemon@'.$domain ) ) {
// Ok, user did not set up system aliases
$maincontent = 'systemaliasnagscreen.tpl';
}
diff --git a/www/admin/service/index.php.in b/www/admin/service/index.php.in
index 2f02b74..4ca67d8 100644
--- a/www/admin/service/index.php.in
+++ b/www/admin/service/index.php.in
@@ -99,7 +99,7 @@ foreach( $domains as $domain ) {
if( !$dn ) {
$errors[] = sprintf(_("No account found for email address %s"), $mail);
} else {
- foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
+ foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'mailer-daemon' ) as $group ) {
$gadr = $group.'@'.$domain;
$attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
'cn' => $gadr,
@@ -327,7 +327,7 @@ if( $auth->group() == 'admin' ) {
!exists_group( 'postmaster@'.$domain ) ||
!exists_group( 'abuse@'.$domain ) ||
!exists_group( 'virusalert@'.$domain ) ||
- !exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+ !exists_group( 'mailer-daemon@'.$domain ) ) {
// Ok, user did not set up system aliases
$systemaliasconf[] = array( 'n'=>$domain_count, 'domain'=>$domain );
}