summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2005-07-05 10:31:51 (GMT)
committerSteffen Hansen <steffen@kdab.com>2005-07-05 10:31:51 (GMT)
commit6f11418a7ff5e7ff8aa04f36c0e7fffc837fa23c (patch)
treee39190bbd79b97099f17f926f2aadc8057f8de4b
parent351745305d63fa75dbaa56cf3b325653dabb5691 (diff)
downloadkolab-webadmin-6f11418a7ff5e7ff8aa04f36c0e7fffc837fa23c.tar.gz
multi-domain config (working) + per-domain maintainer config (not working yet)
-rw-r--r--Makefile.am8
-rwxr-xr-xbootstrap2
-rw-r--r--php/admin/include/form.class.php59
-rw-r--r--php/admin/include/ldap.class.php100
-rw-r--r--php/admin/include/menu.php18
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po319
-rw-r--r--php/admin/locale/fr/LC_MESSAGES/messages.po319
-rw-r--r--php/admin/locale/nl/LC_MESSAGES/messages.po2131
-rw-r--r--php/admin/templates/domainmaintainerlistall.tpl28
-rwxr-xr-xphp/admin/templates/service.tpl25
-rw-r--r--www/admin/domainmaintainer/domainmaintainer.php362
-rw-r--r--www/admin/domainmaintainer/index.php123
-rw-r--r--www/admin/service/index.php35
-rw-r--r--www/admin/user/index.php18
-rw-r--r--www/admin/user/user.php32
15 files changed, 2277 insertions, 1302 deletions
diff --git a/Makefile.am b/Makefile.am
index 90126ea..124eace 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,12 @@ WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
wsmaintainerdir = $(wsadmindir)/maintainer
wsmaintainer_DATA = $(WSMAINTAINER_FILES)
+WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
+ www/admin/domainmaintainer/index.php
+
+wsdomainmaintainerdir = $(wsadmindir)/domainmaintainer
+wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+
WSPICS_FILES = www/admin/pics/erfrakon.png \
www/admin/pics/codefusion.png \
www/admin/pics/intevation_logo.png \
@@ -124,6 +130,7 @@ PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
php/admin/templates/adminlistall.tpl \
php/admin/templates/login.tpl \
php/admin/templates/maintainerlistall.tpl \
+ php/admin/templates/domainmaintainerlistall.tpl \
php/admin/templates/kolab.tpl \
php/admin/templates/versions.tpl \
php/admin/templates/addrlistall.tpl \
@@ -181,6 +188,7 @@ EXTRA_DIST += $(WSTOPLEVEL_FILES) \
$(WSDISTRIBUTIONLIST_FILES) \
$(WSKOLAB_FILES) \
$(WSMAINTAINER_FILES) \
+ $(WSDOMAINMAINTAINER_FILES) \
$(WSPICS_FILES) \
$(WSSERVICE_FILES) \
$(WSsharedfolder_FILES) \
diff --git a/bootstrap b/bootstrap
index 0a38c6b..a227775 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-cp -pr ../../dist_conf .
+cp -pr ../../perl-kolab/dist_conf .
touch NEWS README AUTHORS ChangeLog
diff --git a/php/admin/include/form.class.php b/php/admin/include/form.class.php
index 30b98f1..edf2c8c 100644
--- a/php/admin/include/form.class.php
+++ b/php/admin/include/form.class.php
@@ -84,6 +84,34 @@ class KolabForm {
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
break;
+ case 'email':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ list($uname,$domain) = split('@',$value['value']);
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.$value['value'].'</p><input name="user_'.$key.'" type="hidden" value="'.
+ htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
+ htmlentities($domain).'" /></td>';
+ } else {
+ $str .= '<td><input name="user_'.$key.'" type="text" value="'.htmlentities($uname).'" '
+ .$value['attrs'].' size="'.($size-40).'" />';
+ if( count($value['domains']) == 1 ) {
+ $str .= '<input name="domain_'.$key.'" type="hidden" value="'.htmlentities($value['domains'][0]).'" />';
+ $str .= '<span class="ctrl">@'.htmlentities($value['domains'][0]).'</span></td>';
+ } else {
+ $str .= '@<select name="domain_'.$key.'" '.$value['attrs']." >\n";
+ foreach( $value['domains'] as $dom ) {
+ if( $dom == $domain ) $s = 'selected';
+ else $s = '';
+ $str .= '<option value="'.htmlentities($dom).'" '.$s.'>'.htmlentities($dom).'</option>'."\n";
+ }
+ $str .= '</select>';
+ $str .= '</td>';
+ }
+ }
+ $str .= '<td>'.$value['comment'].'</td>';
+ $str .= '</tr>'."\n";
+ break;
case 'comment':
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
@@ -113,6 +141,24 @@ class KolabForm {
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
break;
+ case 'checklist':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><span class="ctrl">'.(join('<br/>',$value['options'])).'</span></td>';
+ } else {
+ $str .= '<td><table class="contentform">';
+ foreach( $value['options'] as $opt ) {
+ $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
+ debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
+ $str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
+ .htmlentities($opt).'</td></tr>';
+ }
+ $str .= '</table></td>';
+ }
+ $str .= '<td>'.$value['comment'].'</td>';
+ $str .= '</tr>'."\n";
+ break;
case 'select':
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
@@ -241,15 +287,22 @@ class KolabForm {
foreach( $va as $v ) {
//print "validating using $v <br/>";
if( $v == 'notempty' ) {
- //print "checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key]))."<br/>";
+ debug("checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key])));
if( $value['type'] == 'aclselect' ) {
// ignore
+ } else if( $value['type'] == 'email' ) {
+ debug('Checking '.$value['name'].': '.$_REQUEST['user_'.$key]);
+ if( strlen(trim($_REQUEST['user_'.$key])) == 0 ) {
+ $this->errors[] = _('Required field ').$value['name']._(' is empty');
+ }
} else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
$this->errors[] = _('Required field ').$value['name']._(' is empty');
}
} else {
if( $value['type'] == 'aclselect' ) {
$data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key];
+ } else if( $value['type'] == 'email' ) {
+ $data = trim($_REQUEST['user_'.$key]).'@'.trim($_REQUEST['domain_'.$key]);
} else if( $value['type'] == 'resourcepolicy' ) {
$i = 0;
$data = array();
@@ -299,8 +352,12 @@ class KolabForm {
$this->entries[$k]['policies'] = $pols;
} else if( $this->entries[$k]['type'] == 'checkbox' ) {
$this->entries[$k]['value'] = isset( $_REQUEST[$k] );
+ } else if( $this->entries[$k]['type'] == 'checklist' ) {
+ $this->entries[$k]['value'] = $_REQUEST[$k];
} else if( $this->entries[$k]['type'] == 'password' ) {
$this->entries[$k]['value'] = $this->value($k);
+ } else if( $this->entries[$k]['type'] == 'email' ) {
+ $this->entries[$k]['value'] = trim($this->value('user_'.$k)).'@'.trim($this->value('domain_'.$k));
} else {
$this->entries[$k]['value'] = trim($this->value($k));
}
diff --git a/php/admin/include/ldap.class.php b/php/admin/include/ldap.class.php
index 7bc0e53..197d151 100644
--- a/php/admin/include/ldap.class.php
+++ b/php/admin/include/ldap.class.php
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
*
@@ -45,6 +45,7 @@ class KolabLDAP {
$this->is_bound = false;
$this->bind_dn = false;
$this->search_result = false;
+ $this->cached_domains = false;
// Always connect to master server
$this->connection=ldap_connect($_SESSION['ldap_master_uri']);
if (ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3)) {
@@ -128,19 +129,14 @@ class KolabLDAP {
function read( $dn ) {
$result = ldap_read($this->connection, $dn, "(objectclass=*)");
if( !$result ) {
- print $this->error();
return false;
}
$entry = ldap_first_entry($this->connection,$result);
if( !$entry ) {
- print $this->error();
ldap_free_result($result);
return false;
}
$ldap_object = ldap_get_attributes($this->connection,$entry);
- if( !$ldap_object ) {
- print $this->error();
- }
ldap_free_result($result);
return $ldap_object;
}
@@ -288,6 +284,8 @@ class KolabLDAP {
if ($dn) {
$group = 'user';
$filter = '(member='.$this->escape($dn).')';
+ $result = $this->search( 'cn=domain-maintainer,cn=internal,'.$_SESSION['base_dn'], $filter);
+ if (ldap_count_entries($this->connection, $result) > 0) $group = 'domain-maintainer';
$result = $this->search( 'cn=maintainer,cn=internal,'.$_SESSION['base_dn'], $filter);
if (ldap_count_entries($this->connection, $result) > 0) $group = 'maintainer';
$result = $this->search( 'cn=admin,cn=internal,'.$_SESSION["base_dn"], $filter);
@@ -297,6 +295,35 @@ class KolabLDAP {
return $group;
}
+ function domainsForMaintainerDn( $dn ) {
+ if( !$this->is_bound ) {
+ return false;
+ }
+ debug("\tdn=$dn");
+ $domains = array();
+ $filter = '(member='.$this->escape($dn).')';
+ debug("filter:$filter");
+ $result = $this->search( 'cn=domains,cn=internal,'.$_SESSION['base_dn'], $filter);
+ $entries = $this->getEntries();
+ unset($entries['count']);
+ if( count($entries) > 0) {
+ foreach( $entries as $val ) {
+ debug("\tdomain=".$val['cn'][0]);
+ $domains[] = $val['cn'][0];
+ }
+ }
+ return $domains;
+ }
+
+ function domainsForMaintainerUid( $uid ) {
+ debug("domainsForMaintainer( $uid ):");
+ $dn = $this->dnForUid($uid);
+ if($dn) {
+ return $this->domainsForMaintainerDn($dn);
+ }
+ return false;
+ }
+
// Get members of a group as an array of DNs
function groupMembers( $base, $group ) {
global $errors;
@@ -374,6 +401,66 @@ class KolabLDAP {
return $count;
}
+ function domains( $reload = false ) {
+ if( $reload || !$this->cached_domains ) {
+ $kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] );
+ if( !$kolab_obj ) return false;
+ $this->cached_domains = $kolab_obj['postfix-mydestination'];
+ unset($this->cached_domains['count']);
+ debug("loading domains");
+ }
+ debug("ldap->domains() returns ".join(", ", $this->cached_domains));
+ return $this->cached_domains;
+ }
+
+ function addToDomainGroups( $member, $domains ) {
+ foreach( $domains as $domain ) {
+ $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
+ $dom_obj = $this->read( $domgrpdn );
+ if( !$dom_obj ) {
+ debug("+Adding group $domgrpdn with member $member");
+ if( !ldap_add($this->connection, $domgrpdn,
+ array( 'objectClass' => array('top', 'kolabGroupOfNames'),
+ 'cn' => $domain,
+ 'member' => $member ) ) ) {
+ debug("Error adding domain group: ".ldap_error($this->connection));
+ return false;
+ }
+ } else {
+ if( !in_array( $member, $dom_obj['member'] ) ) {
+ debug("+Adding member $member to $domgrpdn");
+ if( !ldap_mod_add( $this->connection, $domgrpdn, array( 'member' => $member ) ) ) {
+ debug("Error adding $member to domain $domgrpdn: ".ldap_error($this->connection));
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ function removeFromDomainGroups( $member, $domains ) {
+ foreach( $domains as $domain ) {
+ $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
+ $dom_obj = $this->read( $domgrpdn );
+ if( $dom_obj ) {
+ if( count( $dom_obj['member'] == 1 ) ) {
+ debug("-Removing group $domgrpdn");
+ if( !ldap_delete( $this->connection, $domgrpdn ) ) {
+ debug("Error deleting domain group $domgrpdn: ".ldap_error($this->connection));
+ return false;
+ }
+ } else {
+ debug("-Removing member $member from group $domgrpdn");
+ if( !ldap_mod_del( $this->connection, $domgrpdn, array( 'member' => $member ) ) ) {
+ debug("Error deleting $member from domain $domgrpdn: ".ldap_error($this->connection));
+ return false;
+ }
+ }
+ }
+ }
+ }
+
// Set deleflag on object, or if $delete_now is
// true, just delete it
function deleteObject( $dn, $delete_now = false ) {
@@ -413,6 +500,7 @@ class KolabLDAP {
var $is_bound;
var $bind_dn;
var $search_result;
+ var $cached_domains;
};
$ldap =& new KolabLDAP;
diff --git a/php/admin/include/menu.php b/php/admin/include/menu.php
index 7ec363c..303ad15 100644
--- a/php/admin/include/menu.php
+++ b/php/admin/include/menu.php
@@ -22,7 +22,7 @@ require_once('locale.php');
$menuitems = array();
-if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
+if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) {
$menuitems['user'] = array( 'name' => _('Users'),
'url' => $topdir.'/user/',
'title' => _('Manage Email Users'),
@@ -41,7 +41,7 @@ if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
array( 'name' => _('Vacation'),
'url' => 'vacation.php' )));
}
-if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
+if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
$menuitems['addressbook'] = array( 'name' => _('Addressbook'),
'url' => $topdir.'/addressbook/',
'title' => _('Manage Address Book'),
@@ -55,7 +55,7 @@ if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
array( 'name' => _('Add Shared Folder'),
'url' => 'sf.php?action=create' )));
}
-if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
+if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
$menuitems['distlist'] = array( 'name' => _('Distribution Lists'),
'url' => $topdir.'/distributionlist/',
'title' => _('Manage Distribution Lists'),
@@ -70,6 +70,12 @@ if( $auth->group() == 'admin' ) {
'submenu' => array(
array( 'name' => _('Create New Administrator'),
'url' => 'admin.php?action=create' ) ) );
+ $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+ 'url' => $topdir.'/domainmaintainer/',
+ 'title' => _('Manage Domain Maintainers'),
+ 'submenu' => array(
+ array( 'name' => _('Create New Domain Maintainer'),
+ 'url' => 'maintainer.php?action=create' ) ) );
}
if( $auth->group() == 'admin' ) {
$menuitems['maintainer'] = array( 'name' => _('Maintainers'),
@@ -77,12 +83,14 @@ if( $auth->group() == 'admin' ) {
'title' => _('Manage Maintainers'),
'submenu' => array(
array( 'name' => _('Create New Maintainer'),
- 'url' => 'maintainer.php?action=create' ) ) );
+ 'url' => 'domainmaintainer.php?action=create' ) ) );
} else if( $auth->group() == 'maintainer' ) {
$mdn = $auth->dn();
$menuitems['maintainer'] = array( 'name' => _('Maintainers'),
'url' => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn),
'title' => _('Manage Maintainer') );
+} else if( $auth->group() == 'domain-maintainer' ) {
+ // Domain maintainer
}
if( $auth->group() == 'admin' ) {
$menuitems['service'] = array( 'name' => _('Services'),
@@ -105,7 +113,7 @@ $menuitems['about'] = array( 'name' => _('About Kolab'),
array( 'name' => _('KDE'),
'url' => 'kde.php' )
));
-if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
+if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
$menuitems['about']['submenu'][] = array( 'name' => _('<b>Versions</b>'),
'url' => 'versions.php' );
}
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index 8d64a5c..f6fcef0 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kolab-messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 17:23+0200\n"
+"POT-Creation-Date: 2005-07-03 16:26+0200\n"
"PO-Revision-Date: 2005-03-11 14:50+0100\n"
"Last-Translator: Matthias Kalle Dalheimer <kalle@klaralvdalens-datakonsult."
"se>\n"
@@ -24,7 +24,7 @@ msgid "The maintainer with DN"
msgstr "Der Maintainer mit DN"
#: tpl_messages.php:3 tpl_messages.php:9 tpl_messages.php:19
-#: tpl_messages.php:216
+#: tpl_messages.php:221
msgid "has been deleted"
msgstr "wurde gelöscht"
@@ -178,7 +178,7 @@ msgstr "Name"
#: tpl_messages.php:29 tpl_messages.php:35 tpl_messages.php:44
#: tpl_messages.php:54 tpl_messages.php:84 tpl_messages.php:104
-#: tpl_messages.php:122 tpl_messages.php:168
+#: tpl_messages.php:122 tpl_messages.php:161 tpl_messages.php:173
msgid "Action"
msgstr "Aktion"
@@ -190,12 +190,12 @@ msgstr "Verändern"
#: tpl_messages.php:31 tpl_messages.php:38 tpl_messages.php:47
#: tpl_messages.php:57 tpl_messages.php:86 tpl_messages.php:109
-#: tpl_messages.php:125 tpl_messages.php:169
-#: ../../../www/admin/user/user.php:736 ../../../www/admin/user/user.php:774
+#: tpl_messages.php:125 tpl_messages.php:162 tpl_messages.php:174
+#: ../../../www/admin/user/user.php:738 ../../../www/admin/user/user.php:776
#: ../../../www/admin/sharedfolder/sf.php:280
#: ../../../www/admin/administrator/admin.php:326
#: ../../../www/admin/distributionlist/list.php:298
-#: ../../../www/admin/addressbook/addr.php:244
+#: ../../../www/admin/addressbook/addr.php:272
msgid "Delete"
msgstr "Löschen"
@@ -477,11 +477,11 @@ msgstr "Normale Nachrichten an den Ordner zustellen"
#: tpl_messages.php:90 tpl_messages.php:100 tpl_messages.php:138
#: tpl_messages.php:142 tpl_messages.php:145 tpl_messages.php:148
#: tpl_messages.php:151 tpl_messages.php:155 tpl_messages.php:158
-#: tpl_messages.php:165 tpl_messages.php:184
+#: tpl_messages.php:170 tpl_messages.php:189
msgid "Update"
msgstr "Aktualisieren"
-#: tpl_messages.php:91 tpl_messages.php:171
+#: tpl_messages.php:91 tpl_messages.php:176
msgid "Welcome to the Kolab administration interface"
msgstr "Willkommen zur Kolab-Systemadministration"
@@ -756,51 +756,60 @@ msgstr ""
#: tpl_messages.php:159
#, fuzzy
+msgid "Domains"
+msgstr "enthält"
+
+#: tpl_messages.php:160
+msgid "Domain"
+msgstr ""
+
+#: tpl_messages.php:163 tpl_messages.php:175
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: tpl_messages.php:164
+#, fuzzy
msgid "Mail Filter Settings"
msgstr "Meine Benutzereinstellungen"
-#: tpl_messages.php:160
+#: tpl_messages.php:165
msgid "Check messages for mismatching From header and envelope from."
msgstr ""
-#: tpl_messages.php:161
+#: tpl_messages.php:166
msgid ""
"Use the Sender header instead of From for the above checks if Sender is "
"present."
msgstr ""
-#: tpl_messages.php:162
+#: tpl_messages.php:167
msgid ""
"Reject the message with the except if it originates from the outside but has "
"a From header that matches the Kolab server's domain. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
-#: tpl_messages.php:163
+#: tpl_messages.php:168
#, fuzzy
msgid "Always reject the message."
msgstr "Immer ablehnen"
-#: tpl_messages.php:164
+#: tpl_messages.php:169
msgid ""
"Note that enabling this setting will make the server reject any mail with "
"non-matching sender and From header if the sender is an account on this "
"server. This is known to cause trouble for example with mailinglists."
msgstr ""
-#: tpl_messages.php:166
+#: tpl_messages.php:171
msgid "Kolab Hosts"
msgstr "Kolab-Hosts"
-#: tpl_messages.php:167
+#: tpl_messages.php:172
msgid "Host"
msgstr "Host"
-#: tpl_messages.php:170
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: tpl_messages.php:172
+#: tpl_messages.php:177
msgid ""
"Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
"the main driving force behind Kolab1&2. In addition to project management "
@@ -810,7 +819,7 @@ msgstr ""
"Haupt-Triebkraft hinter Kolab1&2 waren. Neben dem Projektmanagement hat "
"Intevation auch den größten Teil der Qualitätssicherung übernommen."
-#: tpl_messages.php:173
+#: tpl_messages.php:178
msgid ""
"Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
"business units are strategic consulting, project management and geographic "
@@ -820,15 +829,15 @@ msgstr ""
"Software befaßt. Ihre Geschäftseinheiten sind die strategische Beratung, "
"Projektmanagement und geografische Informationssysteme."
-#: tpl_messages.php:174
+#: tpl_messages.php:179
msgid "The following people worked on Kolab for Intevation:"
msgstr "Die folgenden Mitarbeiter von Intevation haben an Kolab mitgewirkt:"
-#: tpl_messages.php:175
+#: tpl_messages.php:180
msgid "Vacation Notification"
msgstr "Benachrichtigungen bei Abwesenheit"
-#: tpl_messages.php:176
+#: tpl_messages.php:181
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
@@ -837,55 +846,55 @@ msgstr ""
"nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
"Zustellungsordner aktiviert sein)"
-#: tpl_messages.php:177
+#: tpl_messages.php:182
msgid "Resend notification only after"
msgstr "Benachrichtigung erst nach"
-#: tpl_messages.php:178
+#: tpl_messages.php:183
msgid "days"
msgstr "Tagen erneut senden"
-#: tpl_messages.php:179
+#: tpl_messages.php:184
msgid "Send responses for these addresses:"
msgstr "Antworten für diese Adressen schicken:"
-#: tpl_messages.php:180
+#: tpl_messages.php:185
msgid "(one address per line)"
msgstr "(Eine Adresse per Zeile)"
-#: tpl_messages.php:181
+#: tpl_messages.php:186
msgid "Do not send vacation replies to spam messages"
msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden"
-#: tpl_messages.php:182
+#: tpl_messages.php:187
msgid "Only react to mail coming from domain"
msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen"
-#: tpl_messages.php:183
+#: tpl_messages.php:188
msgid "(leave empty for all domains)"
msgstr "(freilassen für alle Domänen)"
-#: tpl_messages.php:185
+#: tpl_messages.php:190
msgid "Attribute"
msgstr "Attribut"
-#: tpl_messages.php:186
+#: tpl_messages.php:191
msgid "Value"
msgstr "Wert"
-#: tpl_messages.php:187
+#: tpl_messages.php:192
msgid "Comment"
msgstr "Kommentar"
-#: tpl_messages.php:188 ../../../www/admin/user/user.php:358
+#: tpl_messages.php:193 ../../../www/admin/user/user.php:358
#: ../../../www/admin/maintainer/maintainer.php:155
#: ../../../www/admin/administrator/admin.php:162
-#: ../../../www/admin/addressbook/addr.php:89
+#: ../../../www/admin/addressbook/addr.php:111
msgid "First Name"
msgstr "Vorname"
-#: tpl_messages.php:189 tpl_messages.php:191 tpl_messages.php:193
-#: tpl_messages.php:195 ../../../www/admin/user/user.php:350
+#: tpl_messages.php:194 tpl_messages.php:196 tpl_messages.php:198
+#: tpl_messages.php:200 ../../../www/admin/user/user.php:350
#: ../../../www/admin/user/user.php:360 ../../../www/admin/user/user.php:363
#: ../../../www/admin/sharedfolder/sf.php:121
#: ../../../www/admin/maintainer/maintainer.php:149
@@ -895,35 +904,35 @@ msgstr "Vorname"
#: ../../../www/admin/administrator/admin.php:164
#: ../../../www/admin/administrator/admin.php:167
#: ../../../www/admin/distributionlist/list.php:126
-#: ../../../www/admin/addressbook/addr.php:91
-#: ../../../www/admin/addressbook/addr.php:94
+#: ../../../www/admin/addressbook/addr.php:113
+#: ../../../www/admin/addressbook/addr.php:116
msgid "Required"
msgstr "Obligatorisch"
-#: tpl_messages.php:190 ../../../www/admin/user/user.php:361
+#: tpl_messages.php:195 ../../../www/admin/user/user.php:361
#: ../../../www/admin/maintainer/maintainer.php:158
#: ../../../www/admin/administrator/admin.php:165
-#: ../../../www/admin/addressbook/addr.php:92
+#: ../../../www/admin/addressbook/addr.php:114
msgid "Last Name"
msgstr "Nachname"
-#: tpl_messages.php:192 ../../../www/admin/user/user.php:364
+#: tpl_messages.php:197 ../../../www/admin/user/user.php:364
#: ../../../www/admin/maintainer/maintainer.php:161
#: ../../../www/admin/administrator/admin.php:168
msgid "Password"
msgstr "Passwort"
-#: tpl_messages.php:194 ../../../www/admin/user/user.php:368
+#: tpl_messages.php:199 ../../../www/admin/user/user.php:368
#: ../../../www/admin/maintainer/maintainer.php:165
#: ../../../www/admin/administrator/admin.php:172
msgid "Verify Password"
msgstr "Passwort überprüfen"
-#: tpl_messages.php:196 ../../../www/admin/user/user.php:372
+#: tpl_messages.php:201 ../../../www/admin/user/user.php:372
msgid "Primary Email Address"
msgstr "Primäre E-Mail-Adresse"
-#: tpl_messages.php:197 ../../../www/admin/user/user.php:349
+#: tpl_messages.php:202 ../../../www/admin/user/user.php:349
#: ../../../www/admin/user/user.php:351
#: ../../../www/admin/sharedfolder/sf.php:124
#: ../../../www/admin/maintainer/maintainer.php:148
@@ -931,91 +940,91 @@ msgstr "Primäre E-Mail-Adresse"
msgid "Required, non volatile"
msgstr "Obligatorisch, nicht-flüchtig"
-#: tpl_messages.php:198 ../../../www/admin/user/user.php:393
-#: ../../../www/admin/addressbook/addr.php:95
+#: tpl_messages.php:203 ../../../www/admin/user/user.php:395
+#: ../../../www/admin/addressbook/addr.php:117
msgid "Title"
msgstr "Titel"
-#: tpl_messages.php:199
+#: tpl_messages.php:204
msgid "Email Alias"
msgstr "E-Mail-Aliasnamen"
-#: tpl_messages.php:200 ../../../www/admin/user/user.php:402
-#: ../../../www/admin/addressbook/addr.php:101
+#: tpl_messages.php:205 ../../../www/admin/user/user.php:404
+#: ../../../www/admin/addressbook/addr.php:124
msgid "Organisation"
msgstr "Organisation"
-#: tpl_messages.php:201 ../../../www/admin/user/user.php:403
-#: ../../../www/admin/addressbook/addr.php:102
+#: tpl_messages.php:206 ../../../www/admin/user/user.php:405
+#: ../../../www/admin/addressbook/addr.php:125
msgid "Organisational Unit"
msgstr "Organisationseinheit"
-#: tpl_messages.php:202 ../../../www/admin/user/user.php:404
-#: ../../../www/admin/addressbook/addr.php:103
+#: tpl_messages.php:207 ../../../www/admin/user/user.php:406
+#: ../../../www/admin/addressbook/addr.php:126
msgid "Room Number"
msgstr "Zimmernummer"
-#: tpl_messages.php:203 ../../../www/admin/user/user.php:405
-#: ../../../www/admin/addressbook/addr.php:104
+#: tpl_messages.php:208 ../../../www/admin/user/user.php:407
+#: ../../../www/admin/addressbook/addr.php:127
msgid "Street Address"
msgstr "Straßenanschrift"
-#: tpl_messages.php:204 ../../../www/admin/user/user.php:406
+#: tpl_messages.php:209 ../../../www/admin/user/user.php:408
msgid "Postbox"
msgstr "Postfach"
-#: tpl_messages.php:205 ../../../www/admin/user/user.php:407
-#: ../../../www/admin/addressbook/addr.php:106
+#: tpl_messages.php:210 ../../../www/admin/user/user.php:409
+#: ../../../www/admin/addressbook/addr.php:129
msgid "Postal Code"
msgstr "Postleitzahl"
-#: tpl_messages.php:206 ../../../www/admin/user/user.php:408
-#: ../../../www/admin/addressbook/addr.php:107
+#: tpl_messages.php:211 ../../../www/admin/user/user.php:410
+#: ../../../www/admin/addressbook/addr.php:130
msgid "City"
msgstr "Stadt"
-#: tpl_messages.php:207 ../../../www/admin/user/user.php:409
-#: ../../../www/admin/addressbook/addr.php:108
+#: tpl_messages.php:212 ../../../www/admin/user/user.php:411
+#: ../../../www/admin/addressbook/addr.php:131
msgid "Country"
msgstr "Land"
-#: tpl_messages.php:208 ../../../www/admin/user/user.php:410
-#: ../../../www/admin/addressbook/addr.php:109
+#: tpl_messages.php:213 ../../../www/admin/user/user.php:412
+#: ../../../www/admin/addressbook/addr.php:132
msgid "Telephone Number"
msgstr "Telefonnummer"
-#: tpl_messages.php:209 ../../../www/admin/user/user.php:411
-#: ../../../www/admin/addressbook/addr.php:110
+#: tpl_messages.php:214 ../../../www/admin/user/user.php:413
+#: ../../../www/admin/addressbook/addr.php:133
msgid "Fax Number"
msgstr "Faxnummer"
-#: tpl_messages.php:210 ../include/menu.php:45
+#: tpl_messages.php:215 ../include/menu.php:45
msgid "Addressbook"
msgstr "Adressbuch"
-#: tpl_messages.php:211
+#: tpl_messages.php:216
msgid "check here to make this users address <br/> visible in the address book"
msgstr ""
"Wählen Sie diese Option an, um die Adresse dieses Benutzers <br/> im "
"Adressbuch anzuzeigen"
-#: tpl_messages.php:212
+#: tpl_messages.php:217
msgid "User Quota in KB"
msgstr "Plattenplatz des Benutzers in KBytes"
-#: tpl_messages.php:213 ../../../www/admin/user/user.php:414
+#: tpl_messages.php:218 ../../../www/admin/user/user.php:416
msgid "Leave blank for unlimited"
msgstr "Freilassen für unbegrenzten Platz"
-#: tpl_messages.php:214 ../include/form.class.php:40
+#: tpl_messages.php:219 ../include/form.class.php:40
msgid "Submit"
msgstr "Absenden"
-#: tpl_messages.php:215
+#: tpl_messages.php:220
msgid "The administrator with DN"
msgstr "Der Administrator mit DN"
-#: tpl_messages.php:217
+#: tpl_messages.php:222
msgid "Back to list of administrators"
msgstr "Zurück zur Liste der Administratoren"
@@ -1083,7 +1092,7 @@ msgid "ends with"
msgstr "endete mit"
#: ../../../www/admin/user/user.php:69
-#: ../../../www/admin/addressbook/addr.php:63
+#: ../../../www/admin/addressbook/addr.php:71
#, fuzzy
msgid "User, vCard or distribution list with this email address already exists"
msgstr ""
@@ -1091,10 +1100,12 @@ msgstr ""
"Adresse"
#: ../../../www/admin/user/user.php:86
+#: ../../../www/admin/addressbook/addr.php:88
msgid "Email address "
msgstr "E-Mail-Adresse"
#: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102
+#: ../../../www/admin/addressbook/addr.php:88
msgid " collision <br />"
msgstr " Kollision <br />"
@@ -1121,7 +1132,7 @@ msgstr "Passwörter stimmen nicht überein"
#: ../../../www/admin/maintainer/maintainer.php:137
#: ../../../www/admin/administrator/admin.php:144
#: ../../../www/admin/distributionlist/list.php:116
-#: ../../../www/admin/addressbook/addr.php:76
+#: ../../../www/admin/addressbook/addr.php:101
msgid "Error: need valid action to proceed"
msgstr "Fehler: kann nicht weitermachen ohne zulässige Aktion"
@@ -1130,7 +1141,7 @@ msgstr "Fehler: kann nicht weitermachen ohne zulässige Aktion"
#: ../../../www/admin/maintainer/maintainer.php:143
#: ../../../www/admin/administrator/admin.php:150
#: ../../../www/admin/distributionlist/list.php:122
-#: ../../../www/admin/addressbook/addr.php:82
+#: ../../../www/admin/addressbook/addr.php:104
msgid "Error: You don't have the required Permissions"
msgstr "Fehler: Sie haben die erforderlichen Zugriffsrechte nicht"
@@ -1145,54 +1156,54 @@ msgstr "Nicht-flüchtig"
msgid "Leave blank to keep password unchanged"
msgstr "Frei lassen, um das alte Passwort beizubehalten"
-#: ../../../www/admin/user/user.php:375
+#: ../../../www/admin/user/user.php:377
msgid "Unique Identity (UID)"
msgstr "Eindeutige Identität (UID)"
-#: ../../../www/admin/user/user.php:377
+#: ../../../www/admin/user/user.php:379
msgid "Optional - Defaults to Primary Email Address"
msgstr "Optional - Default ist die primäre E-Mail-Adresse"
-#: ../../../www/admin/user/user.php:378
+#: ../../../www/admin/user/user.php:380
msgid "Mailbox Home Server"
msgstr "Home-Server des E-Mail-Kontos"
-#: ../../../www/admin/user/user.php:382
+#: ../../../www/admin/user/user.php:384
msgid "Account Type"
msgstr "Kontotyp"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "User Account"
msgstr "Benutzerkonto"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Internal User Account"
msgstr "Internes Benutzerkonto"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Group Account"
msgstr "Gruppenkonto"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Resource Account"
msgstr "Ressourcenkonto"
-#: ../../../www/admin/user/user.php:386
+#: ../../../www/admin/user/user.php:388
msgid ""
"NOTE: An internal user is a user that will not be visible in the address book"
msgstr ""
"ANMERKUNG: Ein interner Benutzer ist ein Benutzer, der nicht im Adressbuch "
"angezeigt wird"
-#: ../../../www/admin/user/user.php:387
+#: ../../../www/admin/user/user.php:389
msgid "Invitation Policy"
msgstr "Einladungs-Policy"
-#: ../../../www/admin/user/user.php:391
+#: ../../../www/admin/user/user.php:393
msgid "For automatic invitation handling"
msgstr "Für das automatische Bearbeiten von Einladungen"
-#: ../../../www/admin/user/user.php:392
+#: ../../../www/admin/user/user.php:394
msgid ""
"NOTE: For regular accounts to use this feature, give the 'calendar' user "
"access to the Calendar folder"
@@ -1200,80 +1211,80 @@ msgstr ""
"ANMERKUNG: Damit normale Konten diese Funktion verwenden können, muss der "
"Benutzer 'calendar' Zugriff auf den Kalender-Ordner haben"
-#: ../../../www/admin/user/user.php:394
+#: ../../../www/admin/user/user.php:396
msgid "Email Aliases"
msgstr "E-Mail-Aliasnamen"
-#: ../../../www/admin/user/user.php:397
-#: ../../../www/admin/addressbook/addr.php:100
+#: ../../../www/admin/user/user.php:399
+#: ../../../www/admin/addressbook/addr.php:123
msgid "One address per line"
msgstr "Eine Adresse per Zeile"
-#: ../../../www/admin/user/user.php:398
+#: ../../../www/admin/user/user.php:400
msgid "Delegates"
msgstr "Delegierungen"
-#: ../../../www/admin/user/user.php:401
+#: ../../../www/admin/user/user.php:403
msgid "One Email address per line"
msgstr "Eine E-Mail-Adresse per Zeile"
-#: ../../../www/admin/user/user.php:413
+#: ../../../www/admin/user/user.php:415
msgid "User Quota in MBytes"
msgstr "Plattenplatz des Benutzers in MBytes"
-#: ../../../www/admin/user/user.php:425
+#: ../../../www/admin/user/user.php:427
msgid "Free/Busy interval in days"
msgstr "Frei/Belegt-Intervall in Tagen"
-#: ../../../www/admin/user/user.php:426
+#: ../../../www/admin/user/user.php:428
msgid "Leave blank for default (60 days)"
msgstr "Freilassen für die Voreinstellung (60 Tage)"
-#: ../../../www/admin/user/user.php:475
+#: ../../../www/admin/user/user.php:477
msgid "Could not encrypt password: "
msgstr "Konnte Passwort nicht verschlüsseln: "
-#: ../../../www/admin/user/user.php:570
+#: ../../../www/admin/user/user.php:572
msgid ""
"Account DN could not be modified, distribution list <a href='/admin/"
"distributionlist/list.php?action=modify&dn="
msgstr ""
-#: ../../../www/admin/user/user.php:647 ../../../www/admin/user/user.php:722
+#: ../../../www/admin/user/user.php:649 ../../../www/admin/user/user.php:724
msgid "Modify User"
msgstr "Benutzer verändern"
-#: ../../../www/admin/user/user.php:695
+#: ../../../www/admin/user/user.php:697
msgid "User "
msgstr "Benutzer "
-#: ../../../www/admin/user/user.php:695
+#: ../../../www/admin/user/user.php:697
#: ../../../www/admin/maintainer/maintainer.php:278
#: ../../../www/admin/administrator/admin.php:285
msgid " successfully created"
msgstr " erfolgreich erzeugt"
-#: ../../../www/admin/user/user.php:696 ../../../www/admin/user/user.php:702
-#: ../../../www/admin/user/user.php:713 ../include/menu.php:30
+#: ../../../www/admin/user/user.php:698 ../../../www/admin/user/user.php:704
+#: ../../../www/admin/user/user.php:715 ../include/menu.php:30
msgid "Create New User"
msgstr "Neuen Benutzer anlegen"
-#: ../../../www/admin/user/user.php:728 ../../../www/admin/user/user.php:766
+#: ../../../www/admin/user/user.php:730 ../../../www/admin/user/user.php:768
msgid "Delete User"
msgstr "Benutzer löschen"
-#: ../../../www/admin/user/user.php:740
+#: ../../../www/admin/user/user.php:742
#: ../../../www/admin/maintainer/maintainer.php:323
#: ../../../www/admin/administrator/admin.php:330
msgid "Error: need dn for delete operation"
msgstr "Fehler: dn wird für Löschoperation benötigt"
-#: ../../../www/admin/user/user.php:742
+#: ../../../www/admin/user/user.php:744
#: ../../../www/admin/maintainer/maintainer.php:325
msgid "Error: you need administrative permissions to delete users"
msgstr "Fehler: Sie benötigen Administratorrechte, um Benutzer zu löschen"
-#: ../../../www/admin/user/user.php:760
+#: ../../../www/admin/user/user.php:762
msgid "User Deleted"
msgstr "Benutzer gelöscht"
@@ -1392,54 +1403,56 @@ msgstr " zum Löschen vorgemerkt"
#: ../../../www/admin/sharedfolder/sf.php:291
#: ../../../www/admin/distributionlist/list.php:311
-#: ../../../www/admin/addressbook/addr.php:257
+#: ../../../www/admin/addressbook/addr.php:285
msgid "Entry Deleted"
msgstr "Eintrag gelöscht"
-#: ../../../www/admin/service/index.php:129
-#: ../../../www/admin/service/index.php:138
-#: ../../../www/admin/service/index.php:147
-#: ../../../www/admin/service/index.php:156
-#: ../../../www/admin/service/index.php:166
-#: ../../../www/admin/service/index.php:175
-#: ../../../www/admin/service/index.php:186
-#: ../../../www/admin/service/index.php:200
-#: ../../../www/admin/service/index.php:215
-#: ../../../www/admin/service/index.php:226
+#: ../../../www/admin/service/index.php:132
+#: ../../../www/admin/service/index.php:141
+#: ../../../www/admin/service/index.php:150
+#: ../../../www/admin/service/index.php:159
+#: ../../../www/admin/service/index.php:169
+#: ../../../www/admin/service/index.php:178
+#: ../../../www/admin/service/index.php:189
+#: ../../../www/admin/service/index.php:203
+#: ../../../www/admin/service/index.php:218
+#: ../../../www/admin/service/index.php:230
+#: ../../../www/admin/service/index.php:245
+#: ../../../www/admin/service/index.php:258
msgid "LDAP Error: failed to modify kolab configuration object: "
msgstr "LDAP-Fehler: Konnte das Kolab-Konfigurationsobjekt nicht verändern: "
-#: ../../../www/admin/service/index.php:233
+#: ../../../www/admin/service/index.php:265
msgid "POP3 Service"
msgstr "POP3-Dienst"
-#: ../../../www/admin/service/index.php:234
+#: ../../../www/admin/service/index.php:266
msgid "POP3/SSL service (TCP port 995)"
msgstr "POP3/SSL-Dienst (TCP-Port 995)"
-#: ../../../www/admin/service/index.php:235
+#: ../../../www/admin/service/index.php:267
msgid "IMAP Service"
msgstr "IMAP-Dienst"
-#: ../../../www/admin/service/index.php:236
+#: ../../../www/admin/service/index.php:268
msgid "IMAP/SSL Service (TCP port 993)"
msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
-#: ../../../www/admin/service/index.php:237
+#: ../../../www/admin/service/index.php:269
msgid "Sieve service (TCP port 2000)"
msgstr "Sieve-Dienst (TCP-Port 2000)"
-#: ../../../www/admin/service/index.php:239
+#: ../../../www/admin/service/index.php:271
msgid "FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)"
msgstr ""
"FTP-Frei/Belegt-Dienst (für Altsysteme, arbeitet nicht mit Kolab2-Frei/"
"Belegt zusammen)"
-#: ../../../www/admin/service/index.php:241
+#: ../../../www/admin/service/index.php:273
msgid "HTTP FreeBusy Service (Legacy)"
msgstr "HTTP-Frei/Belegt-Dienst (für Altsysteme)"
-#: ../../../www/admin/service/index.php:242
+#: ../../../www/admin/service/index.php:274
msgid "Amavis Email Scanning (Virus/Spam)"
msgstr "Amavis-Scannen von E-Mail-Nachrichten (Viren/Spam)"
@@ -1602,48 +1615,48 @@ msgstr " gelöscht"
msgid "not yet implemented"
msgstr "noch nicht implementiert"
-#: ../../../www/admin/addressbook/addr.php:96
+#: ../../../www/admin/addressbook/addr.php:118
msgid "Primary E-Mail Address"
msgstr "Primäre E-Mail-Adresse"
-#: ../../../www/admin/addressbook/addr.php:98
+#: ../../../www/admin/addressbook/addr.php:120
msgid "E-Mail Aliases"
msgstr "E-Mail-Aliasnamen"
-#: ../../../www/admin/addressbook/addr.php:105
+#: ../../../www/admin/addressbook/addr.php:128
msgid "Post Box"
msgstr "Postfach"
-#: ../../../www/admin/addressbook/addr.php:130
+#: ../../../www/admin/addressbook/addr.php:152
msgid "Add External Address"
msgstr "Externe Adresse hinzufügen"
-#: ../../../www/admin/addressbook/addr.php:173
+#: ../../../www/admin/addressbook/addr.php:196
msgid "LDAP Error: could not rename "
msgstr "LDAP-Fehler: umbenennen nicht möglich"
-#: ../../../www/admin/addressbook/addr.php:180
+#: ../../../www/admin/addressbook/addr.php:203
msgid "LDAP Error: could not read "
msgstr "LDAP-Fehler: konnte nicht lesen"
-#: ../../../www/admin/addressbook/addr.php:184
+#: ../../../www/admin/addressbook/addr.php:207
msgid "LDAP Error: could not modify object "
msgstr "LDAP-Fehler: konnte Objekt nicht modifizieren"
-#: ../../../www/admin/addressbook/addr.php:195
+#: ../../../www/admin/addressbook/addr.php:218
msgid "LDAP Error: could not add object "
msgstr "LDAP-Fehler: konnte Objekt nicht hinzufügen"
-#: ../../../www/admin/addressbook/addr.php:207
-#: ../../../www/admin/addressbook/addr.php:227
+#: ../../../www/admin/addressbook/addr.php:230
+#: ../../../www/admin/addressbook/addr.php:250
msgid "Modify External Address"
msgstr "Externe Adresse verändern"
-#: ../../../www/admin/addressbook/addr.php:245
+#: ../../../www/admin/addressbook/addr.php:273
msgid "Delete External Address"
msgstr "Externe Adresse löschen"
-#: ../../../www/admin/addressbook/addr.php:255
+#: ../../../www/admin/addressbook/addr.php:283
msgid "LDAP Error: could not delete "
msgstr "LDAP-Fehler: konnte nicht löschen "
@@ -1751,31 +1764,43 @@ msgstr "<b>Versionen</b>"
msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
msgstr "<tr><th>Attribut</th><th>Wert</th><th>Kommentar</th></tr>"
-#: ../include/form.class.php:179
+#: ../include/form.class.php:137
+msgid "Yes"
+msgstr ""
+
+#: ../include/form.class.php:137
+msgid "No"
+msgstr ""
+
+#: ../include/form.class.php:206
msgid "Always accept"
msgstr "Immer annehmen"
-#: ../include/form.class.php:180
+#: ../include/form.class.php:207
msgid "Always reject"
msgstr "Immer ablehnen"
-#: ../include/form.class.php:181
+#: ../include/form.class.php:208
msgid "Reject if conflicts"
msgstr "Ablehnen im Konfliktfall"
-#: ../include/form.class.php:182
+#: ../include/form.class.php:209
msgid "Manual if conflicts"
msgstr "Im Konfliktfall manuell bearbeiten"
-#: ../include/form.class.php:183
+#: ../include/form.class.php:210
msgid "Manual"
msgstr "Manuell"
-#: ../include/form.class.php:229
+#: ../include/form.class.php:216 ../include/form.class.php:222
+msgid "Anyone"
+msgstr ""
+
+#: ../include/form.class.php:278 ../include/form.class.php:281
msgid "Required field "
msgstr "Obligatorisches Feld "
-#: ../include/form.class.php:229
+#: ../include/form.class.php:278 ../include/form.class.php:281
msgid " is empty"
msgstr " ist leer"
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po
index 333fcc3..56208db 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/php/admin/locale/fr/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 17:24+0200\n"
+"POT-Creation-Date: 2005-07-03 16:26+0200\n"
"PO-Revision-Date: 2005-06-13 18:10+0200\n"
"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
"Language-Team: <fr@li.org>\n"
@@ -28,7 +28,7 @@ msgid "The maintainer with DN"
msgstr "Le mainteneur avec le DN"
#: tpl_messages.php:3 tpl_messages.php:9 tpl_messages.php:19
-#: tpl_messages.php:216
+#: tpl_messages.php:221
msgid "has been deleted"
msgstr "à été effacé"
@@ -178,7 +178,7 @@ msgstr "Nom"
#: tpl_messages.php:29 tpl_messages.php:35 tpl_messages.php:44
#: tpl_messages.php:54 tpl_messages.php:84 tpl_messages.php:104
-#: tpl_messages.php:122 tpl_messages.php:168
+#: tpl_messages.php:122 tpl_messages.php:161 tpl_messages.php:173
msgid "Action"
msgstr "Action"
@@ -190,12 +190,12 @@ msgstr "Modifier"
#: tpl_messages.php:31 tpl_messages.php:38 tpl_messages.php:47
#: tpl_messages.php:57 tpl_messages.php:86 tpl_messages.php:109
-#: tpl_messages.php:125 tpl_messages.php:169
-#: ../../../www/admin/user/user.php:736 ../../../www/admin/user/user.php:774
+#: tpl_messages.php:125 tpl_messages.php:162 tpl_messages.php:174
+#: ../../../www/admin/user/user.php:738 ../../../www/admin/user/user.php:776
#: ../../../www/admin/sharedfolder/sf.php:280
#: ../../../www/admin/administrator/admin.php:326
#: ../../../www/admin/distributionlist/list.php:298
-#: ../../../www/admin/addressbook/addr.php:244
+#: ../../../www/admin/addressbook/addr.php:272
msgid "Delete"
msgstr "Effacer"
@@ -474,11 +474,11 @@ msgstr "Délivrer les mail normaux vers un dossier"
#: tpl_messages.php:90 tpl_messages.php:100 tpl_messages.php:138
#: tpl_messages.php:142 tpl_messages.php:145 tpl_messages.php:148
#: tpl_messages.php:151 tpl_messages.php:155 tpl_messages.php:158
-#: tpl_messages.php:165 tpl_messages.php:184
+#: tpl_messages.php:170 tpl_messages.php:189
msgid "Update"
msgstr "Mise a jour"
-#: tpl_messages.php:91 tpl_messages.php:171
+#: tpl_messages.php:91 tpl_messages.php:176
msgid "Welcome to the Kolab administration interface"
msgstr "Bienvenue dans l'interface d'administration de Kolab"
@@ -750,14 +750,27 @@ msgstr ""
"reçoive des messages venant d'autres domaines internet."
#: tpl_messages.php:159
+#, fuzzy
+msgid "Domains"
+msgstr "contient"
+
+#: tpl_messages.php:160
+msgid "Domain"
+msgstr ""
+
+#: tpl_messages.php:163 tpl_messages.php:175
+msgid "Add"
+msgstr "Ajouter"
+
+#: tpl_messages.php:164
msgid "Mail Filter Settings"
msgstr "Préférences des filtres de messagerie"
-#: tpl_messages.php:160
+#: tpl_messages.php:165
msgid "Check messages for mismatching From header and envelope from."
msgstr ""
-#: tpl_messages.php:161
+#: tpl_messages.php:166
#, fuzzy
msgid ""
"Use the Sender header instead of From for the above checks if Sender is "
@@ -766,19 +779,19 @@ msgstr ""
"Utilisez l'entête de l'envoyeur plutôt que le destinateur si les "
"vérification ci dessus sont activées."
-#: tpl_messages.php:162
+#: tpl_messages.php:167
msgid ""
"Reject the message with the except if it originates from the outside but has "
"a From header that matches the Kolab server's domain. In that case rewrite "
"the From header so the recipient can see the potential forgery."
msgstr ""
-#: tpl_messages.php:163
+#: tpl_messages.php:168
#, fuzzy
msgid "Always reject the message."
msgstr "Toujours rejeter"
-#: tpl_messages.php:164
+#: tpl_messages.php:169
#, fuzzy
msgid ""
"Note that enabling this setting will make the server reject any mail with "
@@ -792,19 +805,15 @@ msgstr ""
"messagerie sur ce serveur. Ceci arrive par exemple avec les listes de "
"discutions."
-#: tpl_messages.php:166
+#: tpl_messages.php:171
msgid "Kolab Hosts"
msgstr "Serveurs Kolab"
-#: tpl_messages.php:167
+#: tpl_messages.php:172
msgid "Host"
msgstr "Serveur"
-#: tpl_messages.php:170
-msgid "Add"
-msgstr "Ajouter"
-
-#: tpl_messages.php:172
+#: tpl_messages.php:177
msgid ""
"Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
"the main driving force behind Kolab1&2. In addition to project management "
@@ -814,7 +823,7 @@ msgstr ""
"qui sont la base des projets pour Kolab1&2. En plus de la gestion de ces "
"projets Intevation à réalisé la plupart du contrôle qualité."
-#: tpl_messages.php:173
+#: tpl_messages.php:178
msgid ""
"Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
"business units are strategic consulting, project management and geographic "
@@ -824,70 +833,70 @@ msgstr ""
"logiciel libre. Ses spécialités sont consultance stratégique, gestion de "
"projets et systèmes géographiques."
-#: tpl_messages.php:174
+#: tpl_messages.php:179
msgid "The following people worked on Kolab for Intevation:"
msgstr "Les personnes suivantes on travaillé sur Kolab pour Intevation:"
-#: tpl_messages.php:175
+#: tpl_messages.php:180
msgid "Vacation Notification"
msgstr "Message d'absence"
-#: tpl_messages.php:176
+#: tpl_messages.php:181
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
msgstr ""
-#: tpl_messages.php:177
+#: tpl_messages.php:182
msgid "Resend notification only after"
msgstr "Seulement renvoyer les notifications après"
-#: tpl_messages.php:178
+#: tpl_messages.php:183
msgid "days"
msgstr "jours"
-#: tpl_messages.php:179
+#: tpl_messages.php:184
msgid "Send responses for these addresses:"
msgstr "Envoyer des réponses pour ces adresses:"
-#: tpl_messages.php:180
+#: tpl_messages.php:185
msgid "(one address per line)"
msgstr "(une adresse par ligne)"
-#: tpl_messages.php:181
+#: tpl_messages.php:186
msgid "Do not send vacation replies to spam messages"
msgstr "Ne pas envoyer de messages d'absence au spam"
-#: tpl_messages.php:182
+#: tpl_messages.php:187
msgid "Only react to mail coming from domain"
msgstr "Réagir seulement au messages venant du domaine"
-#: tpl_messages.php:183
+#: tpl_messages.php:188
msgid "(leave empty for all domains)"
msgstr "(laisser vide pour tout les domaines)"
-#: tpl_messages.php:185
+#: tpl_messages.php:190
msgid "Attribute"
msgstr "Attribut"
-#: tpl_messages.php:186
+#: tpl_messages.php:191
msgid "Value"
msgstr "Valeur"
-#: tpl_messages.php:187
+#: tpl_messages.php:192
msgid "Comment"
msgstr "Commentaire"
-#: tpl_messages.php:188 ../../../www/admin/user/user.php:358
+#: tpl_messages.php:193 ../../../www/admin/user/user.php:358
#: ../../../www/admin/maintainer/maintainer.php:155
#: ../../../www/admin/administrator/admin.php:162
-#: ../../../www/admin/addressbook/addr.php:89
+#: ../../../www/admin/addressbook/addr.php:111
#, fuzzy
msgid "First Name"
msgstr "Prénom"
-#: tpl_messages.php:189 tpl_messages.php:191 tpl_messages.php:193
-#: tpl_messages.php:195 ../../../www/admin/user/user.php:350
+#: tpl_messages.php:194 tpl_messages.php:196 tpl_messages.php:198
+#: tpl_messages.php:200 ../../../www/admin/user/user.php:350
#: ../../../www/admin/user/user.php:360 ../../../www/admin/user/user.php:363
#: ../../../www/admin/sharedfolder/sf.php:121
#: ../../../www/admin/maintainer/maintainer.php:149
@@ -897,36 +906,36 @@ msgstr "Prénom"
#: ../../../www/admin/administrator/admin.php:164
#: ../../../www/admin/administrator/admin.php:167
#: ../../../www/admin/distributionlist/list.php:126
-#: ../../../www/admin/addressbook/addr.php:91
-#: ../../../www/admin/addressbook/addr.php:94
+#: ../../../www/admin/addressbook/addr.php:113
+#: ../../../www/admin/addressbook/addr.php:116
msgid "Required"
msgstr "Requis"
-#: tpl_messages.php:190 ../../../www/admin/user/user.php:361
+#: tpl_messages.php:195 ../../../www/admin/user/user.php:361
#: ../../../www/admin/maintainer/maintainer.php:158
#: ../../../www/admin/administrator/admin.php:165
-#: ../../../www/admin/addressbook/addr.php:92
+#: ../../../www/admin/addressbook/addr.php:114
#, fuzzy
msgid "Last Name"
msgstr "Nom de Famille"
-#: tpl_messages.php:192 ../../../www/admin/user/user.php:364
+#: tpl_messages.php:197 ../../../www/admin/user/user.php:364
#: ../../../www/admin/maintainer/maintainer.php:161
#: ../../../www/admin/administrator/admin.php:168
msgid "Password"
msgstr "Mot de passe"
-#: tpl_messages.php:194 ../../../www/admin/user/user.php:368
+#: tpl_messages.php:199 ../../../www/admin/user/user.php:368
#: ../../../www/admin/maintainer/maintainer.php:165
#: ../../../www/admin/administrator/admin.php:172
msgid "Verify Password"
msgstr "Vérifier le mot de passe"
-#: tpl_messages.php:196 ../../../www/admin/user/user.php:372
+#: tpl_messages.php:201 ../../../www/admin/user/user.php:372
msgid "Primary Email Address"
msgstr "Adresse de messagerie primaire"
-#: tpl_messages.php:197 ../../../www/admin/user/user.php:349
+#: tpl_messages.php:202 ../../../www/admin/user/user.php:349
#: ../../../www/admin/user/user.php:351
#: ../../../www/admin/sharedfolder/sf.php:124
#: ../../../www/admin/maintainer/maintainer.php:148
@@ -934,92 +943,92 @@ msgstr "Adresse de messagerie primaire"
msgid "Required, non volatile"
msgstr "Requis, permanent"
-#: tpl_messages.php:198 ../../../www/admin/user/user.php:393
-#: ../../../www/admin/addressbook/addr.php:95
+#: tpl_messages.php:203 ../../../www/admin/user/user.php:395
+#: ../../../www/admin/addressbook/addr.php:117
msgid "Title"
msgstr "Titre"
-#: tpl_messages.php:199
+#: tpl_messages.php:204
msgid "Email Alias"
msgstr "Alias de l'adresse de messagerie"
-#: tpl_messages.php:200 ../../../www/admin/user/user.php:402
-#: ../../../www/admin/addressbook/addr.php:101
+#: tpl_messages.php:205 ../../../www/admin/user/user.php:404
+#: ../../../www/admin/addressbook/addr.php:124
msgid "Organisation"
msgstr "Organisation"
-#: tpl_messages.php:201 ../../../www/admin/user/user.php:403
-#: ../../../www/admin/addressbook/addr.php:102
+#: tpl_messages.php:206 ../../../www/admin/user/user.php:405
+#: ../../../www/admin/addressbook/addr.php:125
#, fuzzy
msgid "Organisational Unit"
msgstr "Société"
-#: tpl_messages.php:202 ../../../www/admin/user/user.php:404
-#: ../../../www/admin/addressbook/addr.php:103
+#: tpl_messages.php:207 ../../../www/admin/user/user.php:406
+#: ../../../www/admin/addressbook/addr.php:126
msgid "Room Number"
msgstr "Numéro du bureau"
-#: tpl_messages.php:203 ../../../www/admin/user/user.php:405
-#: ../../../www/admin/addressbook/addr.php:104
+#: tpl_messages.php:208 ../../../www/admin/user/user.php:407
+#: ../../../www/admin/addressbook/addr.php:127
msgid "Street Address"
msgstr "Rue"
-#: tpl_messages.php:204 ../../../www/admin/user/user.php:406
+#: tpl_messages.php:209 ../../../www/admin/user/user.php:408
msgid "Postbox"
msgstr "Boite postale"
-#: tpl_messages.php:205 ../../../www/admin/user/user.php:407
-#: ../../../www/admin/addressbook/addr.php:106
+#: tpl_messages.php:210 ../../../www/admin/user/user.php:409
+#: ../../../www/admin/addressbook/addr.php:129
msgid "Postal Code"
msgstr "Code postal"
-#: tpl_messages.php:206 ../../../www/admin/user/user.php:408
-#: ../../../www/admin/addressbook/addr.php:107
+#: tpl_messages.php:211 ../../../www/admin/user/user.php:410
+#: ../../../www/admin/addressbook/addr.php:130
msgid "City"
msgstr "Ville"
-#: tpl_messages.php:207 ../../../www/admin/user/user.php:409
-#: ../../../www/admin/addressbook/addr.php:108
+#: tpl_messages.php:212 ../../../www/admin/user/user.php:411
+#: ../../../www/admin/addressbook/addr.php:131
msgid "Country"
msgstr "Pays"
-#: tpl_messages.php:208 ../../../www/admin/user/user.php:410
-#: ../../../www/admin/addressbook/addr.php:109
+#: tpl_messages.php:213 ../../../www/admin/user/user.php:412
+#: ../../../www/admin/addressbook/addr.php:132
msgid "Telephone Number"
msgstr "Numéro de téléphone"
-#: tpl_messages.php:209 ../../../www/admin/user/user.php:411
-#: ../../../www/admin/addressbook/addr.php:110
+#: tpl_messages.php:214 ../../../www/admin/user/user.php:413
+#: ../../../www/admin/addressbook/addr.php:133
msgid "Fax Number"
msgstr "Numéro de fax"
-#: tpl_messages.php:210 ../include/menu.php:45
+#: tpl_messages.php:215 ../include/menu.php:45
msgid "Addressbook"
msgstr "Carnet d'adresse"
-#: tpl_messages.php:211
+#: tpl_messages.php:216
msgid "check here to make this users address <br/> visible in the address book"
msgstr ""
"Cochez ceci pour faire apparaître l'adresse de cet utilisateur <br/> dans le "
"carnet d'adresse"
-#: tpl_messages.php:212
+#: tpl_messages.php:217
msgid "User Quota in KB"
msgstr "Le quota de l'utilisateur en KB"
-#: tpl_messages.php:213 ../../../www/admin/user/user.php:414
+#: tpl_messages.php:218 ../../../www/admin/user/user.php:416
msgid "Leave blank for unlimited"
msgstr "Laissez vide pour non limité"
-#: tpl_messages.php:214 ../include/form.class.php:40
+#: tpl_messages.php:219 ../include/form.class.php:40
msgid "Submit"
msgstr "Soumettre"
-#: tpl_messages.php:215
+#: tpl_messages.php:220
msgid "The administrator with DN"
msgstr "L'administrateur avec le DN"
-#: tpl_messages.php:217
+#: tpl_messages.php:222
msgid "Back to list of administrators"
msgstr "Retour à la liste des administrateurs"
@@ -1087,15 +1096,17 @@ msgid "ends with"
msgstr "fini avec"
#: ../../../www/admin/user/user.php:69
-#: ../../../www/admin/addressbook/addr.php:63
+#: ../../../www/admin/addressbook/addr.php:71
msgid "User, vCard or distribution list with this email address already exists"
msgstr "L'utilisateur, vCard ou liste de distribution existe déjà"
#: ../../../www/admin/user/user.php:86
+#: ../../../www/admin/addressbook/addr.php:88
msgid "Email address "
msgstr "Adresse de messagerie"
#: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102
+#: ../../../www/admin/addressbook/addr.php:88
msgid " collision <br />"
msgstr " collision <br />"
@@ -1122,7 +1133,7 @@ msgstr "Les mots de passe ne correspondent pas"
#: ../../../www/admin/maintainer/maintainer.php:137
#: ../../../www/admin/administrator/admin.php:144
#: ../../../www/admin/distributionlist/list.php:116
-#: ../../../www/admin/addressbook/addr.php:76
+#: ../../../www/admin/addressbook/addr.php:101
msgid "Error: need valid action to proceed"
msgstr "Erreur: une action valide est nécessaire pour continuer"
@@ -1131,7 +1142,7 @@ msgstr "Erreur: une action valide est nécessaire pour continuer"
#: ../../../www/admin/maintainer/maintainer.php:143
#: ../../../www/admin/administrator/admin.php:150
#: ../../../www/admin/distributionlist/list.php:122
-#: ../../../www/admin/addressbook/addr.php:82
+#: ../../../www/admin/addressbook/addr.php:104
msgid "Error: You don't have the required Permissions"
msgstr "Erreur: Vous n'avez pas les permissions requises"
@@ -1147,54 +1158,54 @@ msgstr "Permanent"
msgid "Leave blank to keep password unchanged"
msgstr "Laissez vide pour garder les mots de passe inchangés"
-#: ../../../www/admin/user/user.php:375
+#: ../../../www/admin/user/user.php:377
msgid "Unique Identity (UID)"
msgstr "Identité unique (UID)"
-#: ../../../www/admin/user/user.php:377
+#: ../../../www/admin/user/user.php:379
msgid "Optional - Defaults to Primary Email Address"
msgstr "Optionnel - Adresse de messagerie primaire par défaut"
-#: ../../../www/admin/user/user.php:378
+#: ../../../www/admin/user/user.php:380
msgid "Mailbox Home Server"
msgstr "Serveur contenant le compte de messagerie"
-#: ../../../www/admin/user/user.php:382
+#: ../../../www/admin/user/user.php:384
msgid "Account Type"
msgstr "Type de compte "
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "User Account"
msgstr "Compte utilisateur"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Internal User Account"
msgstr "Compte utilisateur interne"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Group Account"
msgstr "Compte de groupe"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Resource Account"
msgstr "Compte de ressources"
-#: ../../../www/admin/user/user.php:386
+#: ../../../www/admin/user/user.php:388
msgid ""
"NOTE: An internal user is a user that will not be visible in the address book"
msgstr ""
"NOTE: Un utilisateur interne sera un utilisateur qui ne sera pas visible "
"dans le carnet d'adresse"
-#: ../../../www/admin/user/user.php:387
+#: ../../../www/admin/user/user.php:389
msgid "Invitation Policy"
msgstr "Politique d'invitation"
-#: ../../../www/admin/user/user.php:391
+#: ../../../www/admin/user/user.php:393
msgid "For automatic invitation handling"
msgstr "Pour le gestion des invitation automatiques"
-#: ../../../www/admin/user/user.php:392
+#: ../../../www/admin/user/user.php:394
msgid ""
"NOTE: For regular accounts to use this feature, give the 'calendar' user "
"access to the Calendar folder"
@@ -1202,40 +1213,40 @@ msgstr ""
"NOTE: Pour que les comptes classiques puissent utiliser cette "
"fonctionnalité, donnez à l'utilisateur 'calendar' accès au dossier Calendrier"
-#: ../../../www/admin/user/user.php:394
+#: ../../../www/admin/user/user.php:396
msgid "Email Aliases"
msgstr "Alias de messagerie"
-#: ../../../www/admin/user/user.php:397
-#: ../../../www/admin/addressbook/addr.php:100
+#: ../../../www/admin/user/user.php:399
+#: ../../../www/admin/addressbook/addr.php:123
msgid "One address per line"
msgstr "Une adresse par ligne"
-#: ../../../www/admin/user/user.php:398
+#: ../../../www/admin/user/user.php:400
msgid "Delegates"
msgstr "Delegués"
-#: ../../../www/admin/user/user.php:401
+#: ../../../www/admin/user/user.php:403
msgid "One Email address per line"
msgstr "Une adresse par ligne"
-#: ../../../www/admin/user/user.php:413
+#: ../../../www/admin/user/user.php:415
msgid "User Quota in MBytes"
msgstr "Quota utilisateur en MBytes"
-#: ../../../www/admin/user/user.php:425
+#: ../../../www/admin/user/user.php:427
msgid "Free/Busy interval in days"
msgstr "Options de disponibilités en jours"
-#: ../../../www/admin/user/user.php:426
+#: ../../../www/admin/user/user.php:428
msgid "Leave blank for default (60 days)"
msgstr "Laisser vide pour les défauts (60 jours)"
-#: ../../../www/admin/user/user.php:475
+#: ../../../www/admin/user/user.php:477
msgid "Could not encrypt password: "
msgstr "Impossible de crypter le mot de passe: "
-#: ../../../www/admin/user/user.php:570
+#: ../../../www/admin/user/user.php:572
msgid ""
"Account DN could not be modified, distribution list <a href='/admin/"
"distributionlist/list.php?action=modify&dn="
@@ -1243,43 +1254,43 @@ msgstr ""
"Le DN du compte n'a pas pu être modifié pour la liste de distribution <a "
"href='/admin/distributionlist/list.php?action=modify&dn="
-#: ../../../www/admin/user/user.php:647 ../../../www/admin/user/user.php:722
+#: ../../../www/admin/user/user.php:649 ../../../www/admin/user/user.php:724
msgid "Modify User"
msgstr "Modifier un utilisateur"
-#: ../../../www/admin/user/user.php:695
+#: ../../../www/admin/user/user.php:697
msgid "User "
msgstr "Utilisateur"
-#: ../../../www/admin/user/user.php:695
+#: ../../../www/admin/user/user.php:697
#: ../../../www/admin/maintainer/maintainer.php:278
#: ../../../www/admin/administrator/admin.php:285
msgid " successfully created"
msgstr "crée avec succès"
-#: ../../../www/admin/user/user.php:696 ../../../www/admin/user/user.php:702
-#: ../../../www/admin/user/user.php:713 ../include/menu.php:30
+#: ../../../www/admin/user/user.php:698 ../../../www/admin/user/user.php:704
+#: ../../../www/admin/user/user.php:715 ../include/menu.php:30
msgid "Create New User"
msgstr "Créer un nouvel utilisateur"
-#: ../../../www/admin/user/user.php:728 ../../../www/admin/user/user.php:766
+#: ../../../www/admin/user/user.php:730 ../../../www/admin/user/user.php:768
msgid "Delete User"
msgstr "Effacer un utilisateur"
-#: ../../../www/admin/user/user.php:740
+#: ../../../www/admin/user/user.php:742
#: ../../../www/admin/maintainer/maintainer.php:323
#: ../../../www/admin/administrator/admin.php:330
msgid "Error: need dn for delete operation"
msgstr "Erreur: dn nécessaire pour une opération d'effacement"
-#: ../../../www/admin/user/user.php:742
+#: ../../../www/admin/user/user.php:744
#: ../../../www/admin/maintainer/maintainer.php:325
msgid "Error: you need administrative permissions to delete users"
msgstr ""
"Erreur: vous avez besoin des permissions administrateur pour effacer des "
"utilisateurs"
-#: ../../../www/admin/user/user.php:760
+#: ../../../www/admin/user/user.php:762
msgid "User Deleted"
msgstr "Utilisateur effacé"
@@ -1395,55 +1406,57 @@ msgstr " marqué pour effacement"
#: ../../../www/admin/sharedfolder/sf.php:291
#: ../../../www/admin/distributionlist/list.php:311
-#: ../../../www/admin/addressbook/addr.php:257
+#: ../../../www/admin/addressbook/addr.php:285
msgid "Entry Deleted"
msgstr "Entrée effacée"
-#: ../../../www/admin/service/index.php:129
-#: ../../../www/admin/service/index.php:138
-#: ../../../www/admin/service/index.php:147
-#: ../../../www/admin/service/index.php:156
-#: ../../../www/admin/service/index.php:166
-#: ../../../www/admin/service/index.php:175
-#: ../../../www/admin/service/index.php:186
-#: ../../../www/admin/service/index.php:200
-#: ../../../www/admin/service/index.php:215
-#: ../../../www/admin/service/index.php:226
+#: ../../../www/admin/service/index.php:132
+#: ../../../www/admin/service/index.php:141
+#: ../../../www/admin/service/index.php:150
+#: ../../../www/admin/service/index.php:159
+#: ../../../www/admin/service/index.php:169
+#: ../../../www/admin/service/index.php:178
+#: ../../../www/admin/service/index.php:189
+#: ../../../www/admin/service/index.php:203
+#: ../../../www/admin/service/index.php:218
+#: ../../../www/admin/service/index.php:230
+#: ../../../www/admin/service/index.php:245
+#: ../../../www/admin/service/index.php:258
msgid "LDAP Error: failed to modify kolab configuration object: "
msgstr ""
"Erreur LDAP: échec dans la modification de l'objet de configuration kolab: "
-#: ../../../www/admin/service/index.php:233
+#: ../../../www/admin/service/index.php:265
msgid "POP3 Service"
msgstr "Service POP3"
-#: ../../../www/admin/service/index.php:234
+#: ../../../www/admin/service/index.php:266
msgid "POP3/SSL service (TCP port 995)"
msgstr "Service POP3/SSL (TCP port 995)"
-#: ../../../www/admin/service/index.php:235
+#: ../../../www/admin/service/index.php:267
msgid "IMAP Service"
msgstr "Service IMAP"
-#: ../../../www/admin/service/index.php:236
+#: ../../../www/admin/service/index.php:268
msgid "IMAP/SSL Service (TCP port 993)"
msgstr "Service IMAP/SSL (TCP port 993)"
-#: ../../../www/admin/service/index.php:237
+#: ../../../www/admin/service/index.php:269
msgid "Sieve service (TCP port 2000)"
msgstr "Service Sieve (TCP port 2000)"
-#: ../../../www/admin/service/index.php:239
+#: ../../../www/admin/service/index.php:271
msgid "FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)"
msgstr ""
"Service FTP des options de disponibilités (Ancien, pas compatible avec "
"Kolab2)"
-#: ../../../www/admin/service/index.php:241
+#: ../../../www/admin/service/index.php:273
msgid "HTTP FreeBusy Service (Legacy)"
msgstr "Service HTTP de disponibilité (Ancien)"
-#: ../../../www/admin/service/index.php:242
+#: ../../../www/admin/service/index.php:274
msgid "Amavis Email Scanning (Virus/Spam)"
msgstr "Service de vérification de la messagerie Amavis (Virus/Spam)"
@@ -1607,48 +1620,48 @@ msgstr " effacé"
msgid "not yet implemented"
msgstr "pas encore implémenté"
-#: ../../../www/admin/addressbook/addr.php:96
+#: ../../../www/admin/addressbook/addr.php:118
msgid "Primary E-Mail Address"
msgstr "Adresse de messagerie de base"
-#: ../../../www/admin/addressbook/addr.php:98
+#: ../../../www/admin/addressbook/addr.php:120
msgid "E-Mail Aliases"
msgstr "Alias de l'adresse de messagerie"
-#: ../../../www/admin/addressbook/addr.php:105
+#: ../../../www/admin/addressbook/addr.php:128
msgid "Post Box"
msgstr "Boite postale"
-#: ../../../www/admin/addressbook/addr.php:130
+#: ../../../www/admin/addressbook/addr.php:152
msgid "Add External Address"
msgstr "Ajouter une adresse externe"
-#: ../../../www/admin/addressbook/addr.php:173
+#: ../../../www/admin/addressbook/addr.php:196
msgid "LDAP Error: could not rename "
msgstr "Erreur LDAP: impossible de renommer"
-#: ../../../www/admin/addressbook/addr.php:180
+#: ../../../www/admin/addressbook/addr.php:203
msgid "LDAP Error: could not read "
msgstr "Erreur LDAP: Impossible de lire"
-#: ../../../www/admin/addressbook/addr.php:184
+#: ../../../www/admin/addressbook/addr.php:207
msgid "LDAP Error: could not modify object "
msgstr "Erreur LDAP: impossible de modifier l'objet"
-#: ../../../www/admin/addressbook/addr.php:195
+#: ../../../www/admin/addressbook/addr.php:218
msgid "LDAP Error: could not add object "
msgstr "Erreur LDAP: Impossible d'ajouter un objet"
-#: ../../../www/admin/addressbook/addr.php:207
-#: ../../../www/admin/addressbook/addr.php:227
+#: ../../../www/admin/addressbook/addr.php:230
+#: ../../../www/admin/addressbook/addr.php:250
msgid "Modify External Address"
msgstr "Modifier l'adresse externe"
-#: ../../../www/admin/addressbook/addr.php:245
+#: ../../../www/admin/addressbook/addr.php:273
msgid "Delete External Address"
msgstr "Effacer l'adresse externe"
-#: ../../../www/admin/addressbook/addr.php:255
+#: ../../../www/admin/addressbook/addr.php:283
msgid "LDAP Error: could not delete "
msgstr "Erreur LDAP: impossible d'effacer"
@@ -1756,31 +1769,43 @@ msgstr "<b>Version</b>"
msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
msgstr "<tr><th>Attribut</th><th>Valeur</th><th>Commentaire</th></tr>"
-#: ../include/form.class.php:179
+#: ../include/form.class.php:137
+msgid "Yes"
+msgstr ""
+
+#: ../include/form.class.php:137
+msgid "No"
+msgstr ""
+
+#: ../include/form.class.php:206
msgid "Always accept"
msgstr "Toujours accepter"
-#: ../include/form.class.php:180
+#: ../include/form.class.php:207
msgid "Always reject"
msgstr "Toujours rejeter"
-#: ../include/form.class.php:181
+#: ../include/form.class.php:208
msgid "Reject if conflicts"
msgstr "Rejeter si il y a conflit"
-#: ../include/form.class.php:182
+#: ../include/form.class.php:209
msgid "Manual if conflicts"
msgstr "Passer en mode manuel si il y a conflit"
-#: ../include/form.class.php:183
+#: ../include/form.class.php:210
msgid "Manual"
msgstr "Manuel"
-#: ../include/form.class.php:229
+#: ../include/form.class.php:216 ../include/form.class.php:222
+msgid "Anyone"
+msgstr ""
+
+#: ../include/form.class.php:278 ../include/form.class.php:281
msgid "Required field "
msgstr "Champ "
-#: ../include/form.class.php:229
+#: ../include/form.class.php:278 ../include/form.class.php:281
msgid " is empty"
msgstr "est vide"
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po
index bd8b42d..133c4fd 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/php/admin/locale/nl/LC_MESSAGES/messages.po
@@ -6,104 +6,103 @@
msgid ""
msgstr ""
"Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: <vincent@opensides.be>\n"
-"POT-Creation-Date: 2005-06-08 12:24+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-03 16:26+0200\n"
"PO-Revision-Date: 2005-06-16 19:35+0200\n"
"Last-Translator: Vincent Seynhaeve <vincent@opensides.be>\n"
-"Language-Team: Nerlandais <vincent@opensides.be>\n"
+"Language-Team: Nerlandais <vincent@opensides.be>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10\n"
#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "Het adres met DN"
+msgid "The maintainer with DN"
+msgstr "de maintainer met DN"
-#: tpl_messages.php:3 tpl_messages.php:20 tpl_messages.php:116
-#: tpl_messages.php:185
+#: tpl_messages.php:3 tpl_messages.php:9 tpl_messages.php:19
+#: tpl_messages.php:221
msgid "has been deleted"
msgstr "Is verwijderd"
#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "Terug naar de lijst van adressen"
-
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr " (alleen maar externe adressen zonder Kolab gebruikersaccount) "
-
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:22
-#: tpl_messages.php:118 tpl_messages.php:173 tpl_messages.php:193
-#: ../../../www/admin/addressbook/index.php:119
-#: ../../../www/admin/user/index.php:157
-msgid "Name"
-msgstr "Naam"
-
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:24
-#: tpl_messages.php:68 tpl_messages.php:120 tpl_messages.php:169
-#: tpl_messages.php:175 tpl_messages.php:196
-msgid "Action"
-msgstr "Actie"
-
-#: tpl_messages.php:8 tpl_messages.php:17 tpl_messages.php:26
-#: tpl_messages.php:72 tpl_messages.php:122 tpl_messages.php:177
-#: tpl_messages.php:198
-msgid "Modify"
-msgstr "Wijzigen"
+msgid "Back to list of maintainers"
+msgstr "Terug naar de lijst van de handhavers"
-#: tpl_messages.php:9 tpl_messages.php:18 tpl_messages.php:27
-#: tpl_messages.php:73 tpl_messages.php:123 tpl_messages.php:170
-#: tpl_messages.php:178 tpl_messages.php:199
-#: ../../../www/admin/addressbook/addr.php:244
-#: ../../../www/admin/administrator/admin.php:326
-#: ../../../www/admin/distributionlist/list.php:298
-#: ../../../www/admin/sharedfolder/sf.php:280
-#: ../../../www/admin/user/user.php:736 ../../../www/admin/user/user.php:774
-msgid "Delete"
-msgstr "Verwijderen"
+#: tpl_messages.php:5
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.org\">KDE</a> is een krachtige <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\"> Vrije Software </a> grafische bureau "
+"omgeving voor Linux en Unix werkstations. Het combineert gebruiksgemak, "
+"hedendaagse functionaliteit, een opmerkelijke grafische interface et de "
+"grote technologische superioriteit van het Unix besturingssysteem."
-#: tpl_messages.php:11 tpl_messages.php:188
-msgid "[ ALL ]"
-msgstr "[ ALLE ]"
+#: tpl_messages.php:6
+msgid ""
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
+msgstr ""
+"<b>KDE</b> is een internetproject dat waarlijk in elk opzicht open is. De "
+"ontwikkeling vindt plaats op het internet en wordt bediscussieerd op onze <a "
+"href=\"http://www.kde.org/mailinglists.html\">discussielijsten</a>, USENET "
+"nieuwsgroepen, en IRC kanalen waarop iedereen uitgenodigd en welkom is."
-#: tpl_messages.php:12 tpl_messages.php:189
-msgid "[ OTHER ]"
-msgstr "[ Andere ]"
+#: tpl_messages.php:7
+msgid ""
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://apps.kde.com\">applications</a> for Unix "
+"workstations. KDE has developed a high quality development framework for "
+"Unix, which allows for the rapid and efficient creation of applications."
+msgstr ""
+"<b>KDE</b> is een geëvolueerde desktop suite die een solide basis biedt voor "
+"een groeiend aantal <a href=\"http://apps.kde.com\">toepassingen</a> voor "
+"Unix werkstations. KDE heeft voor Unix een ontwikkelingsomgeving van hoge "
+"kwaliteit ontwikkeld, die een snelle en efficiënte ontwikkeling van "
+"toepassingen toelaat."
-#: tpl_messages.php:13 tpl_messages.php:190
-msgid "Filter:"
-msgstr "Filter"
+#: tpl_messages.php:8
+msgid "The address with DN"
+msgstr "Het adres met DN"
-#: tpl_messages.php:14 tpl_messages.php:191
-msgid "Filter"
-msgstr "Filter"
+#: tpl_messages.php:10
+msgid "Back to list of addresses"
+msgstr "Terug naar de lijst van adressen"
-#: tpl_messages.php:19
-msgid "The administrator with DN"
-msgstr "De beheerder met DN"
+#: tpl_messages.php:11
+msgid "Kolab2 Groupware Server Version"
+msgstr "Kolab2 Groupware Server Versie"
-#: tpl_messages.php:21
-msgid "Back to list of administrators"
-msgstr "Terug naar de lijst van de beheerders"
+#: tpl_messages.php:12
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Kolab2 Groupware Server Component Versies"
-#: tpl_messages.php:23 tpl_messages.php:119
-#: ../../../www/admin/user/index.php:159
-msgid "UID"
-msgstr "UID"
+#: tpl_messages.php:13
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Kolab2 Patched OpenPKG Package Versies"
-#: tpl_messages.php:25 tpl_messages.php:121
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "Object verwijderd, wacht op opruiming..."
+#: tpl_messages.php:14
+msgid "OpenPKG Version"
+msgstr "OpenPKG Versie"
-#: tpl_messages.php:28
+#: tpl_messages.php:15
msgid ""
"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
"email solution provider based in Johannesburg, South Africa specialising in "
"the deployment and support of Kolab."
-msgstr "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is een gespecialiseerde provider voor e-mailoplossingen gevestigd in Johannesburg, Zuid Afrika gespecialiseerd in de verspreiding en ondersteuning van Kolab "
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is een "
+"gespecialiseerde provider voor e-mailoplossingen gevestigd in Johannesburg, "
+"Zuid Afrika gespecialiseerd in de verspreiding en ondersteuning van Kolab "
-#: tpl_messages.php:29
+#: tpl_messages.php:16
msgid ""
"Code Fusion has played, and continues to play, an integral part in "
"developing and extending the Kolab server; specifically with regards to "
@@ -111,368 +110,218 @@ msgid ""
"Directory &reg; as an LDAP backend, as well as extending the <a href="
"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
"client for the Kolab server."
-msgstr "Code Fusion heeft een rol gespeeld, en blijft die nog spelen in de ontwikkeling en de uitbreiding van de Kolab server; vooral met betrekking tot de verbetering van de basis Kolab engine, door de ondersteuning voor Microsoft Active Directory &reg toe te voegen; als een LDAP backend en door het Horde-project te verbeteren <a href=\"http://www.horde.org/\"> door een web-based groupware client voor de Kolab server te voorzien.."
-
-#: tpl_messages.php:30
+msgstr ""
+"Code Fusion heeft een rol gespeeld, en blijft die nog spelen in de "
+"ontwikkeling en de uitbreiding van de Kolab server; vooral met betrekking "
+"tot de verbetering van de basis Kolab engine, door de ondersteuning voor "
+"Microsoft Active Directory &reg toe te voegen; als een LDAP backend en door "
+"het Horde-project te verbeteren <a href=\"http://www.horde.org/\"> door een "
+"web-based groupware client voor de Kolab server te voorzien.."
+
+#: tpl_messages.php:17
msgid ""
"The following people from Code Fusion are involved in the Kolab project (in "
"alphabetical order):"
-msgstr "De volgende mensen van Code Fusion zijn betrokken bij het Kolab project (in de alfabetische volgorde):"
-
-#: tpl_messages.php:31
-msgid "Attribute"
-msgstr "Toewijzing"
-
-#: tpl_messages.php:32
-msgid "Value"
-msgstr "Waarde"
-
-#: tpl_messages.php:33
-msgid "Comment"
-msgstr "Commentaar"
-
-#: tpl_messages.php:34 ../../../www/admin/addressbook/addr.php:89
-#: ../../../www/admin/administrator/admin.php:162
-#: ../../../www/admin/maintainer/maintainer.php:155
-#: ../../../www/admin/user/user.php:358
-msgid "First Name"
-msgstr "Voornaam"
-
-#: tpl_messages.php:35 tpl_messages.php:37 tpl_messages.php:39
-#: tpl_messages.php:41 ../../../www/admin/addressbook/addr.php:91
-#: ../../../www/admin/addressbook/addr.php:94
-#: ../../../www/admin/administrator/admin.php:156
-#: ../../../www/admin/administrator/admin.php:164
-#: ../../../www/admin/administrator/admin.php:167
-#: ../../../www/admin/distributionlist/list.php:126
-#: ../../../www/admin/maintainer/maintainer.php:149
-#: ../../../www/admin/maintainer/maintainer.php:157
-#: ../../../www/admin/maintainer/maintainer.php:160
-#: ../../../www/admin/sharedfolder/sf.php:121
-#: ../../../www/admin/user/user.php:350 ../../../www/admin/user/user.php:360
-#: ../../../www/admin/user/user.php:363
-msgid "Required"
-msgstr "Vereist"
-
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php:92
-#: ../../../www/admin/administrator/admin.php:165
-#: ../../../www/admin/maintainer/maintainer.php:158
-#: ../../../www/admin/user/user.php:361
-msgid "Last Name"
-msgstr "Achternaam"
-
-#: tpl_messages.php:38 ../../../www/admin/administrator/admin.php:168
-#: ../../../www/admin/maintainer/maintainer.php:161
-#: ../../../www/admin/user/user.php:364
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php:172
-#: ../../../www/admin/maintainer/maintainer.php:165
-#: ../../../www/admin/user/user.php:368
-msgid "Verify Password"
-msgstr "Wachtwoord controleren"
-
-#: tpl_messages.php:42 ../../../www/admin/user/user.php:372
-msgid "Primary Email Address"
-msgstr "Primair e-mailadres"
-
-#: tpl_messages.php:43 ../../../www/admin/administrator/admin.php:155
-#: ../../../www/admin/maintainer/maintainer.php:148
-#: ../../../www/admin/sharedfolder/sf.php:124
-#: ../../../www/admin/user/user.php:349 ../../../www/admin/user/user.php:351
-msgid "Required, non volatile"
-msgstr "Vereist, permanent"
-
-#: tpl_messages.php:44 ../../../www/admin/addressbook/addr.php:95
-#: ../../../www/admin/user/user.php:393
-msgid "Title"
-msgstr "Titel"
-
-#: tpl_messages.php:45
-msgid "Email Alias"
-msgstr "E-mail Alias"
-
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php:101
-#: ../../../www/admin/user/user.php:402
-msgid "Organisation"
-msgstr "Organisatie"
-
-#: tpl_messages.php:47 ../../../www/admin/addressbook/addr.php:102
-#: ../../../www/admin/user/user.php:403
-msgid "Organisational Unit"
-msgstr "Organisatorische unit"
-
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php:103
-#: ../../../www/admin/user/user.php:404
-msgid "Room Number"
-msgstr "Kantoornummer"
-
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php:104
-#: ../../../www/admin/user/user.php:405
-msgid "Street Address"
-msgstr "Straat + Adres"
-
-#: tpl_messages.php:50 ../../../www/admin/user/user.php:406
-msgid "Postbox"
-msgstr "Nummer"
-
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php:106
-#: ../../../www/admin/user/user.php:407
-msgid "Postal Code"
-msgstr "Postcode"
-
-#: tpl_messages.php:52 ../../../www/admin/addressbook/addr.php:107
-#: ../../../www/admin/user/user.php:408
-msgid "City"
-msgstr "Stad"
-
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php:108
-#: ../../../www/admin/user/user.php:409
-msgid "Country"
-msgstr "Land"
-
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php:109
-#: ../../../www/admin/user/user.php:410
-msgid "Telephone Number"
-msgstr "Telefoonnummer"
+msgstr ""
+"De volgende mensen van Code Fusion zijn betrokken bij het Kolab project (in "
+"de alfabetische volgorde):"
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php:110
-#: ../../../www/admin/user/user.php:411
-msgid "Fax Number"
-msgstr "Faxnummer"
+#: tpl_messages.php:18
+msgid "The user with DN"
+msgstr "De gebruiker met DN"
-#: tpl_messages.php:56 ../include/menu.php:45
-msgid "Addressbook"
-msgstr "Adresboek"
+#: tpl_messages.php:20
+msgid "Back to list of users"
+msgstr "Terug naar de lijst van de gebruikers"
-#: tpl_messages.php:57
-msgid "check here to make this users address <br/> visible in the address book"
-msgstr "hier aankruisen om dit gebruikersadres zichtbaar te maken in het adresboek"
+#: tpl_messages.php:21
+msgid "User:"
+msgstr "Gebruiker:"
-#: tpl_messages.php:58
-msgid "User Quota in KB"
-msgstr "Beschikbare schijfruimte in KB per gebruiker "
+#: tpl_messages.php:22
+msgid "Role:"
+msgstr "Rol:"
-#: tpl_messages.php:59 ../../../www/admin/user/user.php:414
-msgid "Leave blank for unlimited"
-msgstr "Laat leeg indien onbeperkt"
+#: tpl_messages.php:23
+msgid "Logout"
+msgstr "Logout"
-#: tpl_messages.php:60 ../include/form.class.php:40
-msgid "Submit"
-msgstr "Verzenden"
+#: tpl_messages.php:24
+msgid "Not logged in"
+msgstr "niet ingelogd"
-#: tpl_messages.php:61
-msgid "Email Delivery"
-msgstr "E-mail zending"
+#: tpl_messages.php:25
+msgid "Errors:"
+msgstr "fouten"
-#: tpl_messages.php:62
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr "Activeer de aflevering naar de map (alleen voor afwezigheidsberichten, doorsturen en afleveren naar map kan later nog geactiveerd worden)"
+#: tpl_messages.php:26
+msgid "Message:"
+msgstr "Bericht"
-#: tpl_messages.php:63
-msgid "Deliver regular mail to folder"
-msgstr "Plaats de reguliere mail in map"
+#: tpl_messages.php:27 tpl_messages.php:78
+msgid "(only external addresses without a kolab user account)"
+msgstr " (alleen maar externe adressen zonder Kolab gebruikersaccount) "
-#: tpl_messages.php:64 tpl_messages.php:81 tpl_messages.php:142
-#: tpl_messages.php:146 tpl_messages.php:149 tpl_messages.php:152
-#: tpl_messages.php:155 tpl_messages.php:159 tpl_messages.php:162
-#: tpl_messages.php:166 tpl_messages.php:209
-msgid "Update"
-msgstr "Bijwerken"
+#: tpl_messages.php:28 tpl_messages.php:33 tpl_messages.php:42
+#: tpl_messages.php:52 tpl_messages.php:83 tpl_messages.php:119
+#: ../../../www/admin/user/index.php:157
+#: ../../../www/admin/addressbook/index.php:119
+msgid "Name"
+msgstr "Naam"
-#: tpl_messages.php:65 ../include/menu.php:59
-msgid "Distribution Lists"
-msgstr "Distributielijst"
+#: tpl_messages.php:29 tpl_messages.php:35 tpl_messages.php:44
+#: tpl_messages.php:54 tpl_messages.php:84 tpl_messages.php:104
+#: tpl_messages.php:122 tpl_messages.php:161 tpl_messages.php:173
+msgid "Action"
+msgstr "Actie"
-#: tpl_messages.php:66
-msgid "Listname"
-msgstr "Lijstnaam"
+#: tpl_messages.php:30 tpl_messages.php:37 tpl_messages.php:46
+#: tpl_messages.php:56 tpl_messages.php:85 tpl_messages.php:108
+#: tpl_messages.php:124
+msgid "Modify"
+msgstr "Wijzigen"
-#: tpl_messages.php:67
-msgid "Visibility"
-msgstr "Zichtbaarheid"
+#: tpl_messages.php:31 tpl_messages.php:38 tpl_messages.php:47
+#: tpl_messages.php:57 tpl_messages.php:86 tpl_messages.php:109
+#: tpl_messages.php:125 tpl_messages.php:162 tpl_messages.php:174
+#: ../../../www/admin/user/user.php:738 ../../../www/admin/user/user.php:776
+#: ../../../www/admin/sharedfolder/sf.php:280
+#: ../../../www/admin/administrator/admin.php:326
+#: ../../../www/admin/distributionlist/list.php:298
+#: ../../../www/admin/addressbook/addr.php:272
+msgid "Delete"
+msgstr "Verwijderen"
-#: tpl_messages.php:69
-msgid "Internal"
-msgstr "Intern"
+#: tpl_messages.php:32
+msgid "Shared folders"
+msgstr "Gedeelde mappen"
-#: tpl_messages.php:70
-msgid "Public"
-msgstr "Openbaar"
+#: tpl_messages.php:34
+msgid "Server"
+msgstr "Server"
-#: tpl_messages.php:71 tpl_messages.php:176
+#: tpl_messages.php:36 tpl_messages.php:107
msgid "Folder deleted, awaiting cleanup..."
msgstr "Map verwijderd, wacht op opruiming... "
-#: tpl_messages.php:74
+#: tpl_messages.php:39
msgid ""
"Kolab's concept was done by <a href=\"http://www.erfrakon.com\">erfrakon</"
"a>; the company also designed and implemented the Kolab 1 Server and did the "
"design and architecture for the Kolab 2 Server while providing consulting "
"for the implementation of the Kolab 2 server and the Kolab 2 clients."
msgstr ""
-"De Kolab concept werd gerealiseerd door <a href=\"http://www.erfrakon.com\">erfrakon</"
-"a>; het bedrijf ontwierp en implementeerde de Kolab 1 server en ontwierp en bouwde de kolab 2 server en op het zelfde moment als de consultancy voor de implementatie van de Kolab 2 server and the Kolab 2 clients."
+"De Kolab concept werd gerealiseerd door <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; het bedrijf ontwierp en implementeerde de Kolab 1 server en "
+"ontwierp en bouwde de kolab 2 server en op het zelfde moment als de "
+"consultancy voor de implementatie van de Kolab 2 server and the Kolab 2 "
+"clients."
-#: tpl_messages.php:75
+#: tpl_messages.php:40
msgid ""
"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
"dedicated to opensource software and Linux. The main tasks of erfrakon "
"within the Kolab project are the principle design and architecure of the "
"Kolab groupware solution and the creation of the Kolab 1 server."
-msgstr "<a href=\"http://www.erfrakon.com\">erfrakon< is een consultancy bedrijf gewijd aan opensource software en Linux. De hoofdopdrachten van Efrakon binnen het kolab project zijn het ontwerp en de architectuur van Kolab groupware oplossingen en de creatie van de Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon< is een consultancy bedrijf "
+"gewijd aan opensource software en Linux. De hoofdopdrachten van Efrakon "
+"binnen het kolab project zijn het ontwerp en de architectuur van Kolab "
+"groupware oplossingen en de creatie van de Kolab 1 server."
-#: tpl_messages.php:76
+#: tpl_messages.php:41
msgid "The following people worked on Kolab for erfrakon:"
msgstr "De volgende mensen hebben op Kolab gewerkt voor erfrakon"
-#: tpl_messages.php:77
-msgid "Email Forwarding"
-msgstr "Verzending van e-mail"
-
-#: tpl_messages.php:78
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr "Activeer doorsturen e-mail (alleen voor afwezigheidsbericht, doorsturen en afleveren naar map kan later nog geactiveerd worden)"
-
-#: tpl_messages.php:79
-msgid "Forward mail to"
-msgstr "Stuur mail door naar"
-
-#: tpl_messages.php:80
-msgid "Keep copy on server"
-msgstr "Bewaar een kopie op de server"
-
-#: tpl_messages.php:82
-msgid ""
-"Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
-"the main driving force behind Kolab1&2. In addition to project management "
-"Intevation did most of the quality assurance."
-msgstr "Intevation GmbH coördineerde de projecten: Kroupware en Proko2, die de voornaamste drijvende krachten waren achter Kolab1&2. Naast het project management verzorgde Intevation de meeste kwaliteitscontrole."
-
-#: tpl_messages.php:83
-msgid ""
-"Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
-"business units are strategic consulting, project management and geographic "
-"information systems."
-msgstr "Intevation GmbH is een IT-bedrijf exclusief gefocust op Free Software. Hun business units zijn strategische consulting, projectmanagement en geografische informatiesystemen."
-
-#: tpl_messages.php:84
-msgid "The following people worked on Kolab for Intevation:"
-msgstr "De volgende mensen hebben op Kolab gewerkt voor Intevation:"
-
-#: tpl_messages.php:85
-msgid "The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr "The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
+#: tpl_messages.php:43 tpl_messages.php:53
+#: ../../../www/admin/user/index.php:159
+msgid "UID"
+msgstr "UID"
-#: tpl_messages.php:86
-msgid ""
-"Klar&auml;lvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klar&auml;lvdalens Datakonsult AB is een consulting bedrijf gewijd aan opensource software, Linux, en de <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> bibliotheek. De hoofdopdrachten van KDAB binnen het Kolab "
-"project zijn ontwerp en implementatie van de Kolab KDE clients en de implementatie van de huidige Kolab 2 server."
+#: tpl_messages.php:45 tpl_messages.php:55
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "Object verwijderd, wacht op opruiming..."
-#: tpl_messages.php:87
-msgid "The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
-msgstr "De volgende mensen hebben op Kolab gewerkt voor Klar&auml;lvdalens Datakonsult AB:"
+#: tpl_messages.php:48
+msgid "Enter UID and password to login"
+msgstr "Vul je UID en wachtwoord in om in te loggen"
-#: tpl_messages.php:88
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.org\">KDE</a> is een krachtige <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\"> Vrije Software </a> grafische bureau omgeving voor Linux en Unix werkstations. Het combineert gebruiksgemak, hedendaagse functionaliteit, een opmerkelijke grafische interface et de grote technologische superioriteit van het Unix besturingssysteem."
+#: tpl_messages.php:49
+msgid "Username:"
+msgstr "Gebruikersnaam"
-#: tpl_messages.php:89
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> is een internetproject dat waarlijk in elk opzicht open is. "
-"De ontwikkeling vindt plaats op het internet en wordt bediscussieerd op onze <a href="
-"\"http://www.kde.org/mailinglists.html\">discussielijsten</a>, USENET nieuwsgroepen, en IRC kanalen waarop iedereen uitgenodigd en welkom is."
+#: tpl_messages.php:50
+msgid "Password:"
+msgstr "Wachtwoord"
-#: tpl_messages.php:90
-msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://apps.kde.com\">applications</a> for Unix "
-"workstations. KDE has developed a high quality development framework for "
-"Unix, which allows for the rapid and efficient creation of applications."
-msgstr "<b>KDE</b> is een geëvolueerde desktop suite die een solide basis biedt voor een groeiend aantal <a href=\"http://apps.kde.com\">toepassingen</a> voor Unix werkstations. KDE heeft voor Unix een ontwikkelingsomgeving van hoge kwaliteit ontwikkeld, die een snelle en efficiënte ontwikkeling van toepassingen toelaat."
+#: tpl_messages.php:51 ../include/auth.class.php:123
+msgid "Login"
+msgstr "Login"
-#: tpl_messages.php:91
+#: tpl_messages.php:58
msgid "Kolab2 Groupware Server"
msgstr "Kolab2 Groupware Server"
-#: tpl_messages.php:92
+#: tpl_messages.php:59
msgid ""
"This is the Kolab2 Server. It is Free Software developed by the <a href="
"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
"groupware functionality to Unix/KDE users as well as Windows desktops."
msgstr ""
"Dit is de Kolab2 Server. Het is Free Software ontworpen door de <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, met de bedoeling groupware functionaliteit te brengen voor Unix/KDE gebruikers evenals voor Windows desktops."
+"\"http://www.kolab.org/\">Kolab Project</a>, met de bedoeling groupware "
+"functionaliteit te brengen voor Unix/KDE gebruikers evenals voor Windows "
+"desktops."
-#: tpl_messages.php:93
+#: tpl_messages.php:60
msgid "Kolab builds upon many other Free Software projects, namely:"
msgstr "Kolab is gebaseerd op verschillende Free Software projecten, namelijk:"
-#: tpl_messages.php:94
+#: tpl_messages.php:61
msgid "(HTTP Server)"
msgstr "(HTTP Server)"
-#: tpl_messages.php:95
+#: tpl_messages.php:62
msgid "(IMAP Server)"
msgstr "(IMAP Server)"
-#: tpl_messages.php:96
+#: tpl_messages.php:63
msgid "(LDAP Server)"
msgstr "(LDAP Server)"
-#: tpl_messages.php:97
+#: tpl_messages.php:64
msgid "(MTA)"
msgstr "(MTA)"
-#: tpl_messages.php:98
+#: tpl_messages.php:65
msgid "(FTP Server)"
msgstr "(FTP Server)"
-#: tpl_messages.php:99
+#: tpl_messages.php:66
msgid ""
"The following projects are used in binding the above together, in order to "
"create the Kolab Server:"
-msgstr "De volgende projecten worden gebruikt in verbinding met de bovenstaande, om zodoende de Kolab server te creëren:"
+msgstr ""
+"De volgende projecten worden gebruikt in verbinding met de bovenstaande, om "
+"zodoende de Kolab server te creëren:"
-#: tpl_messages.php:100
+#: tpl_messages.php:67
msgid "The following projects are used as a base for the Kolab Clients:"
msgstr "De volgende projecten worden gebruikt als basis voor de Kolab Clients:"
-#: tpl_messages.php:101
+#: tpl_messages.php:68
msgid ""
"The Kolab project owes a great deal of thanks to the people of the <a href="
"\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
"on many diverse platforms in a reliable and predictable manner, by providing "
"a common, easy-to-install, cross-platform base on which to build the server."
msgstr ""
-"Het Kolab-project bedankt in het bijzonder het project <a href="
-"\"http://www.openpkg.org/\">OpenPKG</a>. OpenPKG laat Kolab toe om op een betrouwbare en voorspelbare manier op verschillende platformen te draaien, door te zorgen voor een gemeenschappelijke basis, een gemakkelijke installatie."
+"Het Kolab-project bedankt in het bijzonder het project <a href=\"http://www."
+"openpkg.org/\">OpenPKG</a>. OpenPKG laat Kolab toe om op een betrouwbare en "
+"voorspelbare manier op verschillende platformen te draaien, door te zorgen "
+"voor een gemeenschappelijke basis, een gemakkelijke installatie."
-#: tpl_messages.php:102
+#: tpl_messages.php:69
msgid ""
"To use all Kolab2 features you need an interoperable client. The KDE Kolab "
"Client was the first such client to be developed and is still considered the "
@@ -481,10 +330,15 @@ msgid ""
"\">KDE Project</a> for providing such a powerful base on which to build this "
"client solution."
msgstr ""
-"Om alle functies van Kolab2 te kunnen gebruiken heb je een client compatible Kolab 2 nodig. De KDE Kolab client was de eerste zo'n client die werd ontwikkeld en wordt nog steeds beschouwd als het referentieplatform voor andere. De KDE groupware component Kontact kan handelen als een Kolab2 client. Onze dankbaarheid gaat uit <a href=\"http://www.kde.org"
-"\">Projet KDE </a> voor het ter beschikking stellen van het krachtige platform waarop de client gebouwd is."
+"Om alle functies van Kolab2 te kunnen gebruiken heb je een client compatible "
+"Kolab 2 nodig. De KDE Kolab client was de eerste zo'n client die werd "
+"ontwikkeld en wordt nog steeds beschouwd als het referentieplatform voor "
+"andere. De KDE groupware component Kontact kan handelen als een Kolab2 "
+"client. Onze dankbaarheid gaat uit <a href=\"http://www.kde.org\">Projet KDE "
+"</a> voor het ter beschikking stellen van het krachtige platform waarop de "
+"client gebouwd is."
-#: tpl_messages.php:103
+#: tpl_messages.php:70
msgid ""
"Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
"to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -492,19 +346,24 @@ msgid ""
"Network Technologies CC. Radley has worked closely with the Kolab community "
"to help develop the Kolab2 storage format."
msgstr ""
-"De gebruikers van Microsoft Outlook onder Microsoft Windows kunnen een eigenaars plug-in gebruiken om onderling te werken met de Kolab server. Voor Kolab2 is de geprefereede plug-in de <a href=\"http://www.toltec.co.za/\">plug-in Toltec</a> geschreven door Radley "
-"Network Technologies CC. Radley heeft nauw samengewerkt met de Kolab gemeenschap om te helpen bij de ontwikkeling van het opslagformaat van Kolab2."
-
-#: tpl_messages.php:104
+"De gebruikers van Microsoft Outlook onder Microsoft Windows kunnen een "
+"eigenaars plug-in gebruiken om onderling te werken met de Kolab server. "
+"Voor Kolab2 is de geprefereede plug-in de <a href=\"http://www.toltec.co.za/"
+"\">plug-in Toltec</a> geschreven door Radley Network Technologies CC. Radley "
+"heeft nauw samengewerkt met de Kolab gemeenschap om te helpen bij de "
+"ontwikkeling van het opslagformaat van Kolab2."
+
+#: tpl_messages.php:71
msgid ""
"A list of additional Outlook plug-ins that provide interoperability with the "
"Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
"\">maintained on the Kolab website</a>."
msgstr ""
-"een lijst van bijkomende Outlook plug-ins die voor wisselwerking zorgt met de Kolab server zijn <a href=\"http://www.kolab.org/kolab-plugins.html"
+"een lijst van bijkomende Outlook plug-ins die voor wisselwerking zorgt met "
+"de Kolab server zijn <a href=\"http://www.kolab.org/kolab-plugins.html"
"\">wordt onderhouden op de Kolab website</a>."
-#: tpl_messages.php:105
+#: tpl_messages.php:72
msgid ""
"There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
"client</a> in development which provides full groupware functionality to "
@@ -515,9 +374,14 @@ msgid ""
"which to build."
msgstr ""
"Er is ook een <a href=\"http://www.kolab.org/webclient.html\">web-based "
-"client</a> in ontplooiing die een volledig groupware functionaliteid aan mobile gebruikers levert door een web interface. De gebruikers kunnen hun mails, kalenders en taken lezen vanaf iedere plaats in de wereld, gewoon door een simple verbinding via een standard web browser. De web client zou niet mogelijk geweest zijn zonder het prima <a href=\"http://www.horde.org/\">Horde project</a>"
-
-#: tpl_messages.php:106
+"client</a> in ontplooiing die een volledig groupware functionaliteid aan "
+"mobile gebruikers levert door een web interface. De gebruikers kunnen hun "
+"mails, kalenders en taken lezen vanaf iedere plaats in de wereld, gewoon "
+"door een simple verbinding via een standard web browser. De web client zou "
+"niet mogelijk geweest zijn zonder het prima <a href=\"http://www.horde.org/"
+"\">Horde project</a>"
+
+#: tpl_messages.php:73
msgid ""
"As Kolab is a Free Software project, anyone can help to extend the "
"functionality of the software. An active community has developed around the "
@@ -528,92 +392,206 @@ msgid ""
"<a href=\"http://www.klaralvdalens-datakonsult.se/\">Klar&auml;lvdalens "
"Datakonsult</a> (client)."
msgstr ""
-"Aangezien Kolab een Free Software project is, kan iedereen helpen om de functionaliteit van de software uit te breiden. Een actieve gemeenschap heeft zich ontwikkeld rond de software met verschillende mensen in de hele wereld. Het project werd opgestart in 2002 door een joint venture van drie bedrijven <a href="
-"\"http://www.erfrakon.com/\">erfrakon</a> (design, architectuur en server); "
-"<a href=\"http://www.intevation.de\">Intevation</a> (project management) en "
-"<a href=\"http://www.klaralvdalens-datakonsult.se/\">Klar&auml;lvdalens "
-"Datakonsult</a> (client)."
+"Aangezien Kolab een Free Software project is, kan iedereen helpen om de "
+"functionaliteit van de software uit te breiden. Een actieve gemeenschap "
+"heeft zich ontwikkeld rond de software met verschillende mensen in de hele "
+"wereld. Het project werd opgestart in 2002 door een joint venture van drie "
+"bedrijven <a href=\"http://www.erfrakon.com/\">erfrakon</a> (design, "
+"architectuur en server); <a href=\"http://www.intevation.de\">Intevation</a> "
+"(project management) en <a href=\"http://www.klaralvdalens-datakonsult.se/"
+"\">Klar&auml;lvdalens Datakonsult</a> (client)."
-#: tpl_messages.php:107
+#: tpl_messages.php:74
msgid ""
"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
"project soon after the original Kolab1 server was released. Its developers "
"are primarily responsible for an updated engine (which forms the base of the "
"Kolab2 server), the web client, as well as contributing to development of "
"the Kolab2 storage format."
-msgstr "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> voegde zich bij het project net nadat de Kolab1 server was uitgebracht. Het zijn voornamelijk deze ontwikkelaars die verantwoordelijk zijn voor verbeterde engine (die de basis vormt voor de Kolab2 server), de webclient, evenals voor de bijdrage tot de ontwikkeling van het Kolab2 opslagformaat."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> voegde zich bij "
+"het project net nadat de Kolab1 server was uitgebracht. Het zijn "
+"voornamelijk deze ontwikkelaars die verantwoordelijk zijn voor verbeterde "
+"engine (die de basis vormt voor de Kolab2 server), de webclient, evenals "
+"voor de bijdrage tot de ontwikkeling van het Kolab2 opslagformaat."
-#: tpl_messages.php:108
+#: tpl_messages.php:75
msgid "Other contributors:"
msgstr "Andere medewerkers"
-#: tpl_messages.php:109
+#: tpl_messages.php:76
msgid "CSSified the Kolab1 web admin GUI"
msgstr "CSSified de Kolab1 webbeheerder GUI"
-#: tpl_messages.php:110
+#: tpl_messages.php:77
msgid ""
"The principal authors of the Kolab client and server software are (in "
"alphabetical order):"
-msgstr "De voornaamste auteurs van de Kolab client en server software zijn (in alfabetische volgorde):"
+msgstr ""
+"De voornaamste auteurs van de Kolab client en server software zijn (in "
+"alfabetische volgorde):"
-#: tpl_messages.php:111
-msgid "Enter UID and password to login"
-msgstr "Vul je UID en wachtwoord in om in te loggen"
+#: tpl_messages.php:79 tpl_messages.php:114
+msgid "[ ALL ]"
+msgstr "[ ALLE ]"
-#: tpl_messages.php:112
-msgid "Username:"
-msgstr "Gebruikersnaam"
+#: tpl_messages.php:80 tpl_messages.php:115
+msgid "[ OTHER ]"
+msgstr "[ Andere ]"
-#: tpl_messages.php:113
-msgid "Password:"
-msgstr "Wachtwoord"
+#: tpl_messages.php:81 tpl_messages.php:116
+msgid "Filter:"
+msgstr "Filter"
-#: tpl_messages.php:114 ../include/auth.class.php:123
-msgid "Login"
-msgstr "Login"
+#: tpl_messages.php:82 tpl_messages.php:117
+msgid "Filter"
+msgstr "Filter"
-#: tpl_messages.php:115
-msgid "The maintainer with DN"
-msgstr "de maintainer met DN"
+#: tpl_messages.php:87
+msgid "Email Delivery"
+msgstr "E-mail zending"
-#: tpl_messages.php:117
-msgid "Back to list of maintainers"
-msgstr "Terug naar de lijst van de handhavers"
+#: tpl_messages.php:88
+msgid ""
+"Activate delivery to folder (only one of vacation, forward and delivery to "
+"folder can be active at any time)"
+msgstr ""
+"Activeer de aflevering naar de map (alleen voor afwezigheidsberichten, "
+"doorsturen en afleveren naar map kan later nog geactiveerd worden)"
-#: tpl_messages.php:124
-msgid "User:"
-msgstr "Gebruiker:"
+#: tpl_messages.php:89
+msgid "Deliver regular mail to folder"
+msgstr "Plaats de reguliere mail in map"
-#: tpl_messages.php:125
-msgid "Role:"
-msgstr "Rol:"
+#: tpl_messages.php:90 tpl_messages.php:100 tpl_messages.php:138
+#: tpl_messages.php:142 tpl_messages.php:145 tpl_messages.php:148
+#: tpl_messages.php:151 tpl_messages.php:155 tpl_messages.php:158
+#: tpl_messages.php:170 tpl_messages.php:189
+msgid "Update"
+msgstr "Bijwerken"
-#: tpl_messages.php:126
-msgid "Logout"
-msgstr "Logout"
+#: tpl_messages.php:91 tpl_messages.php:176
+msgid "Welcome to the Kolab administration interface"
+msgstr "Welkom op Kolab beheersinterface"
-#: tpl_messages.php:127
-msgid "Not logged in"
-msgstr "niet ingelogd"
+#: tpl_messages.php:92
+msgid "NOTE:"
+msgstr "OPMERKING:"
-#: tpl_messages.php:128
-msgid "Errors:"
-msgstr "fouten"
+#: tpl_messages.php:93
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, please do so and then go"
+msgstr ""
+"Geen enkel acount is ingesteld om mail te ontvangen voor administratieve "
+"adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er een "
+"aan te maken en ga dan verder"
-#: tpl_messages.php:129
-msgid "Message:"
-msgstr "Bericht"
+#: tpl_messages.php:94
+msgid "here"
+msgstr "hier"
-#: tpl_messages.php:130
+#: tpl_messages.php:95
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+"Om het doorsturen van mail naar administratieve e-mailadressen in te stellen."
+
+#: tpl_messages.php:96
+msgid "Email Forwarding"
+msgstr "Verzending van e-mail"
+
+#: tpl_messages.php:97
+msgid ""
+"Activate email forwarding (only one of vacation, forward and delivery to "
+"folder can be active at any time)"
+msgstr ""
+"Activeer doorsturen e-mail (alleen voor afwezigheidsbericht, doorsturen en "
+"afleveren naar map kan later nog geactiveerd worden)"
+
+#: tpl_messages.php:98
+msgid "Forward mail to"
+msgstr "Stuur mail door naar"
+
+#: tpl_messages.php:99
+msgid "Keep copy on server"
+msgstr "Bewaar een kopie op de server"
+
+#: tpl_messages.php:101 ../include/menu.php:59
+msgid "Distribution Lists"
+msgstr "Distributielijst"
+
+#: tpl_messages.php:102
+msgid "Listname"
+msgstr "Lijstnaam"
+
+#: tpl_messages.php:103
+msgid "Visibility"
+msgstr "Zichtbaarheid"
+
+#: tpl_messages.php:105
+msgid "Internal"
+msgstr "Intern"
+
+#: tpl_messages.php:106
+msgid "Public"
+msgstr "Openbaar"
+
+#: tpl_messages.php:110
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr ""
+"The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
+
+#: tpl_messages.php:111
+msgid ""
+"Klar&auml;lvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+"Klar&auml;lvdalens Datakonsult AB is een consulting bedrijf gewijd aan "
+"opensource software, Linux, en de <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> bibliotheek. De hoofdopdrachten van KDAB binnen het "
+"Kolab project zijn ontwerp en implementatie van de Kolab KDE clients en de "
+"implementatie van de huidige Kolab 2 server."
+
+#: tpl_messages.php:112
+msgid ""
+"The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
+msgstr ""
+"De volgende mensen hebben op Kolab gewerkt voor Klar&auml;lvdalens "
+"Datakonsult AB:"
+
+#: tpl_messages.php:113
+msgid "Email Users"
+msgstr "Gebruikerse-mail"
+
+#: tpl_messages.php:118
+msgid "Type"
+msgstr "Soort"
+
+#: tpl_messages.php:120
+msgid "E-mail"
+msgstr "E-mail"
+
+#: tpl_messages.php:121
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:123
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Gebruiker verwijderd, wacht op opruiming..."
+
+#: tpl_messages.php:126
msgid "Kolab Server Settings"
msgstr "Kolab Server Instellingen"
-#: tpl_messages.php:131
+#: tpl_messages.php:127
msgid "Administrative email addresses"
msgstr "Administratief e-mailadres"
-#: tpl_messages.php:132
+#: tpl_messages.php:128
msgid ""
"You have not yet set up a receiving account for the administrative email "
"addresses hostmaster@yourdomain.tld, postmaster@yourdomain.tld, MAILER-"
@@ -622,29 +600,33 @@ msgid ""
"create a distribution list for each of those addresses. Later you can add or "
"remove people from the lists like any other distribution list"
msgstr ""
-"U hebt nog geen adres gedefinieerd voor de ontvangst van administratieve e-mailadressen hostmaster@yourdomain.tld, postmaster@yourdomain.tld, MAILER-"
+"U hebt nog geen adres gedefinieerd voor de ontvangst van administratieve e-"
+"mailadressen hostmaster@yourdomain.tld, postmaster@yourdomain.tld, MAILER-"
"DAEMON@yourdomain.tld, abuse@yourdomain.tld and virusalert@yourdomain.tld. "
-"Vul hieronder het e-mailadres in van een Kolab account en druk op de knop om een distributielijst te creëren voor elk van deze adressen. Later kunt u nog personen toevoegen of verwijderen van deze lijst zoals op elke andere distributielijst."
+"Vul hieronder het e-mailadres in van een Kolab account en druk op de knop om "
+"een distributielijst te creëren voor elk van deze adressen. Later kunt u nog "
+"personen toevoegen of verwijderen van deze lijst zoals op elke andere "
+"distributielijst."
-#: tpl_messages.php:133
+#: tpl_messages.php:129
msgid "Email address of account that should receive administrative mail:"
msgstr "E-mailadres van de account die de administratieve mail moet ontvagen:"
-#: tpl_messages.php:134
+#: tpl_messages.php:130
msgid "Create Distribution Lists"
msgstr "Maak distributielijsten"
-#: tpl_messages.php:135
+#: tpl_messages.php:131
msgid "Enable or Disable individual Services"
msgstr ""
-#: tpl_messages.php:136
+#: tpl_messages.php:132
msgid ""
"Using legacy services poses a security thread due to leakage of cleartext "
"passwords, lack of authenticity and privacy."
msgstr ""
-#: tpl_messages.php:137
+#: tpl_messages.php:133
msgid ""
"The legacy Freebusy Support (FTP and HTTP) is only required for Outlook2000 "
"clients. Under all other circumstances it is advised to use the server-side "
@@ -652,770 +634,633 @@ msgid ""
"default and may not be deactivated)."
msgstr ""
-#: tpl_messages.php:138
+#: tpl_messages.php:134
msgid ""
"Further details with regards to security considerations are available on the "
"internet at the <a href=\"http://www.kolab.org\">Kolab</a> webserver."
msgstr ""
-#: tpl_messages.php:139 ../include/menu.php:88
+#: tpl_messages.php:135 ../include/menu.php:88
msgid "Services"
msgstr "Diensten"
-#: tpl_messages.php:140
+#: tpl_messages.php:136
msgid "Service"
msgstr "Dienst"
-#: tpl_messages.php:141
+#: tpl_messages.php:137
msgid "Enabled"
msgstr "ingeschakeld"
-#: tpl_messages.php:143
+#: tpl_messages.php:139
msgid "Quota settings"
msgstr " instellingen"
-#: tpl_messages.php:144
+#: tpl_messages.php:140
msgid "Warn users when they have used"
msgstr "Waarschuw de gebruikers wanneer ze gebruikt hebben"
-#: tpl_messages.php:145
+#: tpl_messages.php:141
#, php-format
msgid "% of their quota"
msgstr "% van hun quota"
-#: tpl_messages.php:147
+#: tpl_messages.php:143
msgid "Free/Busy settings"
msgstr "Vrij/bezig instellingen"
-#: tpl_messages.php:148
+#: tpl_messages.php:144
msgid "Allow unauthenticated downloading of Free/Busy information"
msgstr ""
-"Laat een niet geautentificeerde downloading toe van vrij/bezig informatie "
-" "
+"Laat een niet geautentificeerde downloading toe van vrij/bezig informatie "
-#: tpl_messages.php:150
+#: tpl_messages.php:146
msgid "When creating free/busy lists, include data from"
msgstr "Wanneer vrij/bezig lijsten worden gecreëerd, voeg gegevens in van"
-#: tpl_messages.php:151
+#: tpl_messages.php:147
msgid "days in the past"
msgstr "Vorige dagen"
-#: tpl_messages.php:153
+#: tpl_messages.php:149
msgid "Privileged Networks"
msgstr "Bevoorrechte netwerken"
-#: tpl_messages.php:154
+#: tpl_messages.php:150
msgid ""
"Networks allowed to relay and send mail through unauthenticated SMTP "
"connections to the Kolab server (comma separated networks in x.x.x.x/y "
"format):"
-msgstr "Netwerken die de toestemming hebben om mail te zenden en door te sturen via een niet geautentificeerde SMTP verbinding met de Kolab server (netwerken gescheiden door komma's in het formaat x.x.x.x/y ):"
+msgstr ""
+"Netwerken die de toestemming hebben om mail te zenden en door te sturen via "
+"een niet geautentificeerde SMTP verbinding met de Kolab server (netwerken "
+"gescheiden door komma's in het formaat x.x.x.x/y ):"
-#: tpl_messages.php:156
+#: tpl_messages.php:152
msgid "SMTP \"smarthost/relayhost\""
msgstr "SMTP \"smarthost/relayhost\""
-#: tpl_messages.php:157
+#: tpl_messages.php:153
msgid ""
"Smarthost to use to send outgoing mail (host.domain.tld). Leave empty for no "
"relayhost."
-msgstr "Smarthost te gebruiken om uitgaande mail te versturen (host.domain.tld). Leeg laten indien geen relayhost"
+msgstr ""
+"Smarthost te gebruiken om uitgaande mail te versturen (host.domain.tld). "
+"Leeg laten indien geen relayhost"
-#: tpl_messages.php:158
+#: tpl_messages.php:154
msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
msgstr "Activeer de MX controle voor de relayhost (bij twijfel, leeg laten)"
-#: tpl_messages.php:160
+#: tpl_messages.php:156
msgid "Accept Internet Mail"
msgstr "Internet mail aanvaarden"
-#: tpl_messages.php:161
+#: tpl_messages.php:157
msgid ""
"Accept mail from other domains over non-authenticated SMTP. This must be "
"enabled if you want to use the Kolab server to receive mail from other "
"internet domains."
-msgstr "Aanvaard mail van ander domeinen via niet geautentificeerde SMTP. Dat moet ingeschakeld zijn wanneer je de Kolab server wil gebruiken om mail te ontvangen via ander internetdomeinen. "
-
-#: tpl_messages.php:163
-msgid "Mail Filter Settings"
-msgstr "Mail filter instellingen"
-
-#: tpl_messages.php:164
-msgid ""
-"Only allow mail with a trustable From header for accounts on this server. "
-"Note that enabling this setting will make the server reject any mail with "
-"non-matching sender and From header if the sender is an account on this "
-"server. This is known to happen for example with mailinglists."
msgstr ""
-"Laat enkel mail toe met een betrouwbare From header voor accounts op deze server. "
-"Merk op dat het inschakelen van deze instelling ervoor zorgt dat de server alle mail weigert met non-matching afzender en from header als de afzender een account heeft op deze server. Dit gebeurt soms met mailinglijsten."
+"Aanvaard mail van ander domeinen via niet geautentificeerde SMTP. Dat moet "
+"ingeschakeld zijn wanneer je de Kolab server wil gebruiken om mail te "
+"ontvangen via ander internetdomeinen. "
-#: tpl_messages.php:165
-msgid "Use the Sender header instead of From for the above checks if present."
-msgstr "Gebruik de Sender header in plaats van From voor de bovenstaande aankruisingen indien aanwezig."
-
-#: tpl_messages.php:167
-msgid "Kolab Hosts"
-msgstr "Kolab Hosts"
+#: tpl_messages.php:159
+#, fuzzy
+msgid "Domains"
+msgstr "bevat"
-#: tpl_messages.php:168
-msgid "Host"
-msgstr "Host"
+#: tpl_messages.php:160
+msgid "Domain"
+msgstr ""
-#: tpl_messages.php:171
+#: tpl_messages.php:163 tpl_messages.php:175
msgid "Add"
msgstr "Toevoegen"
-#: tpl_messages.php:172
-msgid "Shared folders"
-msgstr "Gedeelde mappen"
-
-#: tpl_messages.php:174
-msgid "Server"
-msgstr "Server"
-
-#: tpl_messages.php:179 tpl_messages.php:214
-msgid "Welcome to the Kolab administration interface"
-msgstr "Welkom op Kolab beheersinterface"
+#: tpl_messages.php:164
+msgid "Mail Filter Settings"
+msgstr "Mail filter instellingen"
-#: tpl_messages.php:180
-msgid "NOTE:"
-msgstr "OPMERKING:"
+#: tpl_messages.php:165
+msgid "Check messages for mismatching From header and envelope from."
+msgstr ""
-#: tpl_messages.php:181
+#: tpl_messages.php:166
+#, fuzzy
msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, please do so and then go"
-msgstr "Geen enkel acount is ingesteld om mail te ontvangen voor administratieve adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er een aan te maken en ga dan verder"
-
-#: tpl_messages.php:182
-msgid "here"
-msgstr "hier"
+"Use the Sender header instead of From for the above checks if Sender is "
+"present."
+msgstr ""
+"Gebruik de Sender header in plaats van From voor de bovenstaande "
+"aankruisingen indien aanwezig."
-#: tpl_messages.php:183
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "Om het doorsturen van mail naar administratieve e-mailadressen in te stellen."
+#: tpl_messages.php:167
+msgid ""
+"Reject the message with the except if it originates from the outside but has "
+"a From header that matches the Kolab server's domain. In that case rewrite "
+"the From header so the recipient can see the potential forgery."
+msgstr ""
-#: tpl_messages.php:184
-msgid "The user with DN"
-msgstr "De gebruiker met DN"
+#: tpl_messages.php:168
+#, fuzzy
+msgid "Always reject the message."
+msgstr "Altijd afwijzen"
-#: tpl_messages.php:186
-msgid "Back to list of users"
-msgstr "Terug naar de lijst van de gebruikers"
+#: tpl_messages.php:169
+#, fuzzy
+msgid ""
+"Note that enabling this setting will make the server reject any mail with "
+"non-matching sender and From header if the sender is an account on this "
+"server. This is known to cause trouble for example with mailinglists."
+msgstr ""
+"Laat enkel mail toe met een betrouwbare From header voor accounts op deze "
+"server. Merk op dat het inschakelen van deze instelling ervoor zorgt dat de "
+"server alle mail weigert met non-matching afzender en from header als de "
+"afzender een account heeft op deze server. Dit gebeurt soms met "
+"mailinglijsten."
-#: tpl_messages.php:187
-msgid "Email Users"
-msgstr "Gebruikerse-mail"
+#: tpl_messages.php:171
+msgid "Kolab Hosts"
+msgstr "Kolab Hosts"
-#: tpl_messages.php:192
-msgid "Type"
-msgstr "Soort"
+#: tpl_messages.php:172
+msgid "Host"
+msgstr "Host"
-#: tpl_messages.php:194
-msgid "E-mail"
-msgstr "E-mail"
+#: tpl_messages.php:177
+msgid ""
+"Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
+"the main driving force behind Kolab1&2. In addition to project management "
+"Intevation did most of the quality assurance."
+msgstr ""
+"Intevation GmbH coördineerde de projecten: Kroupware en Proko2, die de "
+"voornaamste drijvende krachten waren achter Kolab1&2. Naast het project "
+"management verzorgde Intevation de meeste kwaliteitscontrole."
-#: tpl_messages.php:195
-msgid "uid"
-msgstr "uid"
+#: tpl_messages.php:178
+msgid ""
+"Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
+"business units are strategic consulting, project management and geographic "
+"information systems."
+msgstr ""
+"Intevation GmbH is een IT-bedrijf exclusief gefocust op Free Software. Hun "
+"business units zijn strategische consulting, projectmanagement en "
+"geografische informatiesystemen."
-#: tpl_messages.php:197
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Gebruiker verwijderd, wacht op opruiming..."
+#: tpl_messages.php:179
+msgid "The following people worked on Kolab for Intevation:"
+msgstr "De volgende mensen hebben op Kolab gewerkt voor Intevation:"
-#: tpl_messages.php:200
+#: tpl_messages.php:180
msgid "Vacation Notification"
msgstr "Afwezigheidsbericht"
-#: tpl_messages.php:201
+#: tpl_messages.php:181
msgid ""
"Activate vacation notification (only one of vacation, forward and delivery "
"to folder can be active at any time)"
-msgstr "Activeer afwezigheidsbericht (enkel één vakantie, forward en aflevering naar folder kan tezelfdertijd geactieveerd zijn)"
+msgstr ""
+"Activeer afwezigheidsbericht (enkel één vakantie, forward en aflevering naar "
+"folder kan tezelfdertijd geactieveerd zijn)"
-#: tpl_messages.php:202
+#: tpl_messages.php:182
msgid "Resend notification only after"
msgstr "Stuur mededeling enkel na "
-#: tpl_messages.php:203
+#: tpl_messages.php:183
msgid "days"
msgstr "dagen"
-#: tpl_messages.php:204
+#: tpl_messages.php:184
msgid "Send responses for these addresses:"
msgstr "Stuur antwoorden voor deze adressen:"
-#: tpl_messages.php:205
+#: tpl_messages.php:185
msgid "(one address per line)"
msgstr "(een adres per lijn)"
-#: tpl_messages.php:206
+#: tpl_messages.php:186
msgid "Do not send vacation replies to spam messages"
msgstr "Geen afwezigheidsberichten sturen naar spam"
-#: tpl_messages.php:207
+#: tpl_messages.php:187
msgid "Only react to mail coming from domain"
msgstr "Reageer alleen op mail afkomstig van het domein"
-#: tpl_messages.php:208
+#: tpl_messages.php:188
msgid "(leave empty for all domains)"
msgstr "(leeg laten voor alle domeinen)"
-#: tpl_messages.php:210
-msgid "Kolab2 Groupware Server Version"
-msgstr "Kolab2 Groupware Server Versie"
+#: tpl_messages.php:190
+msgid "Attribute"
+msgstr "Toewijzing"
-#: tpl_messages.php:211
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Kolab2 Groupware Server Component Versies"
+#: tpl_messages.php:191
+msgid "Value"
+msgstr "Waarde"
-#: tpl_messages.php:212
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Kolab2 Patched OpenPKG Package Versies"
+#: tpl_messages.php:192
+msgid "Comment"
+msgstr "Commentaar"
-#: tpl_messages.php:213
-msgid "OpenPKG Version"
-msgstr "OpenPKG Versie"
+#: tpl_messages.php:193 ../../../www/admin/user/user.php:358
+#: ../../../www/admin/maintainer/maintainer.php:155
+#: ../../../www/admin/administrator/admin.php:162
+#: ../../../www/admin/addressbook/addr.php:111
+msgid "First Name"
+msgstr "Voornaam"
-#: ../../../www/admin/addressbook/addr.php:17
-#: ../../../www/admin/addressbook/index.php:21
-#: ../../../www/admin/administrator/index.php:32
-#: ../../../www/admin/distributionlist/index.php:34
-#: ../../../www/admin/distributionlist/list.php:36
-#: ../../../www/admin/maintainer/index.php:32
-#: ../../../www/admin/service/index.php:13
-#: ../../../www/admin/sharedfolder/index.php:21
-#: ../../../www/admin/sharedfolder/sf.php:24
-#: ../../../www/admin/user/index.php:33
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Fout: je hebt geen toegangsrechten voor dit Menu "
+#: tpl_messages.php:194 tpl_messages.php:196 tpl_messages.php:198
+#: tpl_messages.php:200 ../../../www/admin/user/user.php:350
+#: ../../../www/admin/user/user.php:360 ../../../www/admin/user/user.php:363
+#: ../../../www/admin/sharedfolder/sf.php:121
+#: ../../../www/admin/maintainer/maintainer.php:149
+#: ../../../www/admin/maintainer/maintainer.php:157
+#: ../../../www/admin/maintainer/maintainer.php:160
+#: ../../../www/admin/administrator/admin.php:156
+#: ../../../www/admin/administrator/admin.php:164
+#: ../../../www/admin/administrator/admin.php:167
+#: ../../../www/admin/distributionlist/list.php:126
+#: ../../../www/admin/addressbook/addr.php:113
+#: ../../../www/admin/addressbook/addr.php:116
+msgid "Required"
+msgstr "Vereist"
-#: ../../../www/admin/addressbook/addr.php:63
-#: ../../../www/admin/user/user.php:69
-msgid "User, vCard or distribution list with this email address already exists"
-msgstr "Gebruiker, vCard of distributielijst met dit e-mailadres bestaat al"
+#: tpl_messages.php:195 ../../../www/admin/user/user.php:361
+#: ../../../www/admin/maintainer/maintainer.php:158
+#: ../../../www/admin/administrator/admin.php:165
+#: ../../../www/admin/addressbook/addr.php:114
+msgid "Last Name"
+msgstr "Achternaam"
-#: ../../../www/admin/addressbook/addr.php:76
-#: ../../../www/admin/administrator/admin.php:144
-#: ../../../www/admin/distributionlist/list.php:116
-#: ../../../www/admin/maintainer/maintainer.php:137
-#: ../../../www/admin/sharedfolder/sf.php:111
-#: ../../../www/admin/user/user.php:329
-msgid "Error: need valid action to proceed"
-msgstr "Fout: heeft een geldige actie nodig om door te gaan"
+#: tpl_messages.php:197 ../../../www/admin/user/user.php:364
+#: ../../../www/admin/maintainer/maintainer.php:161
+#: ../../../www/admin/administrator/admin.php:168
+msgid "Password"
+msgstr "Wachtwoord"
-#: ../../../www/admin/addressbook/addr.php:82
-#: ../../../www/admin/administrator/admin.php:150
-#: ../../../www/admin/distributionlist/list.php:122
-#: ../../../www/admin/maintainer/maintainer.php:143
-#: ../../../www/admin/sharedfolder/sf.php:117
-#: ../../../www/admin/user/user.php:340 ../../../www/admin/user/user.php:344
-msgid "Error: You don't have the required Permissions"
-msgstr "Fout: je hebt de nodige toegangsrechten niet"
+#: tpl_messages.php:199 ../../../www/admin/user/user.php:368
+#: ../../../www/admin/maintainer/maintainer.php:165
+#: ../../../www/admin/administrator/admin.php:172
+msgid "Verify Password"
+msgstr "Wachtwoord controleren"
-#: ../../../www/admin/addressbook/addr.php:96
-msgid "Primary E-Mail Address"
-msgstr "Hoofd e-mailadres"
+#: tpl_messages.php:201 ../../../www/admin/user/user.php:372
+msgid "Primary Email Address"
+msgstr "Primair e-mailadres"
-#: ../../../www/admin/addressbook/addr.php:98
-msgid "E-Mail Aliases"
-msgstr "E-Mail Aliassen"
+#: tpl_messages.php:202 ../../../www/admin/user/user.php:349
+#: ../../../www/admin/user/user.php:351
+#: ../../../www/admin/sharedfolder/sf.php:124
+#: ../../../www/admin/maintainer/maintainer.php:148
+#: ../../../www/admin/administrator/admin.php:155
+msgid "Required, non volatile"
+msgstr "Vereist, permanent"
-#: ../../../www/admin/addressbook/addr.php:100
-#: ../../../www/admin/user/user.php:397
-msgid "One address per line"
-msgstr "Een adres per lijn"
+#: tpl_messages.php:203 ../../../www/admin/user/user.php:395
+#: ../../../www/admin/addressbook/addr.php:117
+msgid "Title"
+msgstr "Titel"
-#: ../../../www/admin/addressbook/addr.php:105
-msgid "Post Box"
-msgstr "Postnummer"
+#: tpl_messages.php:204
+msgid "Email Alias"
+msgstr "E-mail Alias"
+
+#: tpl_messages.php:205 ../../../www/admin/user/user.php:404
+#: ../../../www/admin/addressbook/addr.php:124
+msgid "Organisation"
+msgstr "Organisatie"
+
+#: tpl_messages.php:206 ../../../www/admin/user/user.php:405
+#: ../../../www/admin/addressbook/addr.php:125
+msgid "Organisational Unit"
+msgstr "Organisatorische unit"
+
+#: tpl_messages.php:207 ../../../www/admin/user/user.php:406
+#: ../../../www/admin/addressbook/addr.php:126
+msgid "Room Number"
+msgstr "Kantoornummer"
+
+#: tpl_messages.php:208 ../../../www/admin/user/user.php:407
+#: ../../../www/admin/addressbook/addr.php:127
+msgid "Street Address"
+msgstr "Straat + Adres"
+
+#: tpl_messages.php:209 ../../../www/admin/user/user.php:408
+msgid "Postbox"
+msgstr "Nummer"
+
+#: tpl_messages.php:210 ../../../www/admin/user/user.php:409
+#: ../../../www/admin/addressbook/addr.php:129
+msgid "Postal Code"
+msgstr "Postcode"
+#: tpl_messages.php:211 ../../../www/admin/user/user.php:410
#: ../../../www/admin/addressbook/addr.php:130
-msgid "Add External Address"
-msgstr "Extern adres toevoegen"
+msgid "City"
+msgstr "Stad"
-#: ../../../www/admin/addressbook/addr.php:173
-msgid "LDAP Error: could not rename "
-msgstr "LDAP fout: kon naam niet wijzigen"
+#: tpl_messages.php:212 ../../../www/admin/user/user.php:411
+#: ../../../www/admin/addressbook/addr.php:131
+msgid "Country"
+msgstr "Land"
-#: ../../../www/admin/addressbook/addr.php:180
-msgid "LDAP Error: could not read "
-msgstr "LDAP fout: leesfout"
+#: tpl_messages.php:213 ../../../www/admin/user/user.php:412
+#: ../../../www/admin/addressbook/addr.php:132
+msgid "Telephone Number"
+msgstr "Telefoonnummer"
-#: ../../../www/admin/addressbook/addr.php:184
-msgid "LDAP Error: could not modify object "
-msgstr "LDAP fout: kon het object niet aanpassen"
+#: tpl_messages.php:214 ../../../www/admin/user/user.php:413
+#: ../../../www/admin/addressbook/addr.php:133
+msgid "Fax Number"
+msgstr "Faxnummer"
-#: ../../../www/admin/addressbook/addr.php:195
-msgid "LDAP Error: could not add object "
-msgstr "LDAP fout: kon geen object toevoegen"
+#: tpl_messages.php:215 ../include/menu.php:45
+msgid "Addressbook"
+msgstr "Adresboek"
-#: ../../../www/admin/addressbook/addr.php:207
-#: ../../../www/admin/addressbook/addr.php:227
-msgid "Modify External Address"
-msgstr "Pas extern adres aan"
+#: tpl_messages.php:216
+msgid "check here to make this users address <br/> visible in the address book"
+msgstr ""
+"hier aankruisen om dit gebruikersadres zichtbaar te maken in het adresboek"
-#: ../../../www/admin/addressbook/addr.php:245
-msgid "Delete External Address"
-msgstr "Verwijder extern adres "
+#: tpl_messages.php:217
+msgid "User Quota in KB"
+msgstr "Beschikbare schijfruimte in KB per gebruiker "
-#: ../../../www/admin/addressbook/addr.php:255
-msgid "LDAP Error: could not delete "
-msgstr "LDAP fout: kon niet verwijderen"
+#: tpl_messages.php:218 ../../../www/admin/user/user.php:416
+msgid "Leave blank for unlimited"
+msgstr "Laat leeg indien onbeperkt"
-#: ../../../www/admin/addressbook/addr.php:257
-#: ../../../www/admin/distributionlist/list.php:311
-#: ../../../www/admin/sharedfolder/sf.php:291
-msgid "Entry Deleted"
-msgstr "Entry verwijderd"
+#: tpl_messages.php:219 ../include/form.class.php:40
+msgid "Submit"
+msgstr "Verzenden"
+
+#: tpl_messages.php:220
+msgid "The administrator with DN"
+msgstr "De beheerder met DN"
+
+#: tpl_messages.php:222
+msgid "Back to list of administrators"
+msgstr "Terug naar de lijst van de beheerders"
+
+#: ../../../www/admin/user/deliver.php:37
+#, fuzzy
+msgid ""
+"Net/Sieve.php is missing. Without that, filter settings are not available"
+msgstr ""
+"Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
+
+#: ../../../www/admin/user/deliver.php:66
+#: ../../../www/admin/user/forward.php:70
+msgid "Script was:"
+msgstr "Script was:"
+
+#: ../../../www/admin/user/forward.php:38
+#: ../../../www/admin/user/vacation.php:17
+msgid ""
+"Net/Sieve.php is missing. Without that, vacation settings are not available"
+msgstr ""
+"Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
+
+#: ../../../www/admin/user/forward.php:64 ../../../www/admin/user/user.php:58
+msgid "Please enter an email address"
+msgstr "Gelieve een e-mailadresin te geven"
+
+#: ../../../www/admin/user/index.php:33
+#: ../../../www/admin/sharedfolder/index.php:21
+#: ../../../www/admin/sharedfolder/sf.php:24
+#: ../../../www/admin/service/index.php:13
+#: ../../../www/admin/maintainer/index.php:32
+#: ../../../www/admin/administrator/index.php:32
+#: ../../../www/admin/distributionlist/list.php:36
+#: ../../../www/admin/distributionlist/index.php:34
+#: ../../../www/admin/addressbook/addr.php:17
+#: ../../../www/admin/addressbook/index.php:21
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Fout: je hebt geen toegangsrechten voor dit Menu "
-#: ../../../www/admin/addressbook/index.php:120
#: ../../../www/admin/user/index.php:158
+#: ../../../www/admin/addressbook/index.php:120
msgid "Email"
msgstr "E-mail"
-#: ../../../www/admin/addressbook/index.php:121
#: ../../../www/admin/user/index.php:160
+#: ../../../www/admin/addressbook/index.php:121
msgid "contains"
msgstr "bevat"
-#: ../../../www/admin/addressbook/index.php:122
#: ../../../www/admin/user/index.php:161
+#: ../../../www/admin/addressbook/index.php:122
msgid "is"
msgstr "is"
-#: ../../../www/admin/addressbook/index.php:123
#: ../../../www/admin/user/index.php:162
+#: ../../../www/admin/addressbook/index.php:123
msgid "begins with"
msgstr "begint met"
-#: ../../../www/admin/addressbook/index.php:124
#: ../../../www/admin/user/index.php:163
+#: ../../../www/admin/addressbook/index.php:124
msgid "ends with"
msgstr "Eindigt met"
-#: ../../../www/admin/administrator/admin.php:51
-#: ../../../www/admin/maintainer/maintainer.php:51
-msgid "Account with this UID already exists"
-msgstr "Account met deze UID bestaat reeds"
+#: ../../../www/admin/user/user.php:69
+#: ../../../www/admin/addressbook/addr.php:71
+msgid "User, vCard or distribution list with this email address already exists"
+msgstr "Gebruiker, vCard of distributielijst met dit e-mailadres bestaat al"
+
+#: ../../../www/admin/user/user.php:86
+#: ../../../www/admin/addressbook/addr.php:88
+msgid "Email address "
+msgstr "E-mailadres"
+
+#: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102
+#: ../../../www/admin/addressbook/addr.php:88
+msgid " collision <br />"
+msgstr "conflict"
+
+#: ../../../www/admin/user/user.php:102
+msgid "UID "
+msgstr "UID"
-#: ../../../www/admin/administrator/admin.php:60
-#: ../../../www/admin/maintainer/maintainer.php:60
#: ../../../www/admin/user/user.php:141
+#: ../../../www/admin/maintainer/maintainer.php:60
+#: ../../../www/admin/administrator/admin.php:60
msgid "Password is empty"
msgstr "Wachtwoord is leeg"
-#: ../../../www/admin/administrator/admin.php:63
-#: ../../../www/admin/administrator/admin.php:68
+#: ../../../www/admin/user/user.php:144 ../../../www/admin/user/user.php:149
#: ../../../www/admin/maintainer/maintainer.php:63
#: ../../../www/admin/maintainer/maintainer.php:68
-#: ../../../www/admin/user/user.php:144 ../../../www/admin/user/user.php:149
+#: ../../../www/admin/administrator/admin.php:63
+#: ../../../www/admin/administrator/admin.php:68
msgid "Passwords dont match"
msgstr "Wachtwoorden stemmen niet overeen"
-#: ../../../www/admin/administrator/admin.php:98
-msgid "Manager's password can't be changed from the webgui"
-msgstr "Managers wachtwoord kan niet gewijzigd worden via de webgui"
-
-#: ../../../www/admin/administrator/admin.php:158
-#: ../../../www/admin/maintainer/maintainer.php:151
-msgid "non volatile"
-msgstr "permanent"
-
-#: ../../../www/admin/administrator/admin.php:159
-#: ../../../www/admin/maintainer/maintainer.php:152
-#: ../../../www/admin/user/user.php:354
-msgid "Leave blank to keep password unchanged"
-msgstr "Laat leeg om wachtwoord niet te wijzigen"
-
-#: ../../../www/admin/administrator/admin.php:176
-#: ../../../www/admin/maintainer/maintainer.php:169
-msgid "Unique User ID"
-msgstr "Unieke gebruikers ID"
-
-#: ../../../www/admin/administrator/admin.php:264
-#: ../../../www/admin/administrator/admin.php:312
-msgid "Modify Administrator"
-msgstr "Wijzig Administrator"
-
-#: ../../../www/admin/administrator/admin.php:265
-#: ../../../www/admin/administrator/admin.php:285
-msgid "Administrator "
-msgstr "Administrator "
-
-#: ../../../www/admin/administrator/admin.php:265
-#: ../../../www/admin/maintainer/maintainer.php:260
-msgid " successfully modified"
-msgstr "Wijziging succesvol"
-
-#: ../../../www/admin/administrator/admin.php:285
-#: ../../../www/admin/maintainer/maintainer.php:278
-#: ../../../www/admin/user/user.php:695
-msgid " successfully created"
-msgstr "Creatie succesvol"
-
-#: ../../../www/admin/administrator/admin.php:286
-#: ../../../www/admin/administrator/admin.php:292
-#: ../../../www/admin/administrator/admin.php:303 ../include/menu.php:71
-msgid "Create New Administrator"
-msgstr "Creëer nieuwe Administrator"
-
-#: ../../../www/admin/administrator/admin.php:318
-msgid "Delete Administrator"
-msgstr "Verwijder Administrator"
-
-#: ../../../www/admin/administrator/admin.php:330
-#: ../../../www/admin/maintainer/maintainer.php:323
-#: ../../../www/admin/user/user.php:740
-msgid "Error: need dn for delete operation"
-msgstr "Fout: dn nodig om handeling te verwijderen"
-
-#: ../../../www/admin/administrator/admin.php:332
-msgid "Error: you need administrative permissions to delete administrators"
-msgstr "Fout : je hebt administratieve toegangsrechten nodig om administrators te verwijderen"
-
-#: ../../../www/admin/administrator/admin.php:346
-msgid "Administrator Deleted"
-msgstr "Administrator verwijderd"
-
-#: ../../../www/admin/administrator/index.php:60
-msgid "Manage Administrators ("
-msgstr "Beheer Administrators ("
-
-#: ../../../www/admin/administrator/index.php:60
-msgid " Administrators)"
-msgstr "Administrators)"
-
-#: ../../../www/admin/distributionlist/index.php:62
-msgid "not yet implemented"
-msgstr "nog niet geïmplementeerd"
-
-#: ../../../www/admin/distributionlist/list.php:45
-msgid "Please add at least one member"
-msgstr "Gelieve tenminste een lid toe te voegen"
-
-#: ../../../www/admin/distributionlist/list.php:71
-msgid "User or distribution list with this email address already exists"
-msgstr "Gebruiker of distributielijst met dit e-mailadres bestaat al"
-
-#: ../../../www/admin/distributionlist/list.php:124
-msgid "List Name"
-msgstr "Lijstnaam"
-
-#: ../../../www/admin/distributionlist/list.php:127
-msgid "Members"
-msgstr "Leden"
-
-#: ../../../www/admin/distributionlist/list.php:129
-msgid "One email address per line"
-msgstr "Een e-mailadres per lijn"
-
-#: ../../../www/admin/distributionlist/list.php:132
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: ../../../www/admin/distributionlist/list.php:135
-msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
-msgstr "Kruis hier aan om de distribitielijst beschikbaar allen voor authoriseerde gebruikers"
-
-#: ../../../www/admin/distributionlist/list.php:154
-msgid "Add Distribution List"
-msgstr "Voeg distributielijst toe"
-
-#: ../../../www/admin/distributionlist/list.php:207
-#: ../../../www/admin/distributionlist/list.php:216
-msgid "Distribution List updated"
-msgstr "Distributielijst geüpdatet"
-
-#: ../../../www/admin/distributionlist/list.php:265
-#: ../../../www/admin/distributionlist/list.php:281
-msgid "Modify Distribution List"
-msgstr "Distributielijst wijzigen"
-
-#: ../../../www/admin/distributionlist/list.php:299
-msgid "Delete Distribution List"
-msgstr "Distributielijst verwijderen"
-
-#: ../../../www/admin/distributionlist/list.php:310
-msgid "Distribution List "
-msgstr "Distributielijst"
-
-#: ../../../www/admin/distributionlist/list.php:310
-msgid " deleted"
-msgstr "verwijderd"
-
-#: ../../../www/admin/maintainer/index.php:59
-msgid "Manage Maintainers ("
-msgstr "Beheer van de Maintainers("
-
-#: ../../../www/admin/maintainer/index.php:59
-msgid " Maintainers)"
-msgstr "Maintainers)"
-
-#: ../../../www/admin/maintainer/maintainer.php:259
-#: ../../../www/admin/maintainer/maintainer.php:305
-msgid "Modify Maintainer"
-msgstr "Maintainers wijzigen"
-
-#: ../../../www/admin/maintainer/maintainer.php:260
-#: ../../../www/admin/maintainer/maintainer.php:278
-msgid "Maintainer "
-msgstr "Maintainers"
-
-#: ../../../www/admin/maintainer/maintainer.php:279
-#: ../../../www/admin/maintainer/maintainer.php:285
-#: ../../../www/admin/maintainer/maintainer.php:296 ../include/menu.php:79
-msgid "Create New Maintainer"
-msgstr "Maintainers aanmaken"
-
-#: ../../../www/admin/maintainer/maintainer.php:311
-msgid "Delete Maintainer"
-msgstr "Maintainers verwijderen"
-
-#: ../../../www/admin/maintainer/maintainer.php:325
-#: ../../../www/admin/user/user.php:742
-msgid "Error: you need administrative permissions to delete users"
-msgstr "Fout: je hebt administratieve rechten nodig om gebruikers te verwijderen"
-
-#: ../../../www/admin/maintainer/maintainer.php:341
-msgid "Maintainer Deleted"
-msgstr "Maintainer verwijderd"
-
-#: ../../../www/admin/service/index.php:127
-#: ../../../www/admin/service/index.php:136
-#: ../../../www/admin/service/index.php:145
-#: ../../../www/admin/service/index.php:154
-#: ../../../www/admin/service/index.php:164
-#: ../../../www/admin/service/index.php:173
-#: ../../../www/admin/service/index.php:183
-#: ../../../www/admin/service/index.php:197
-#: ../../../www/admin/service/index.php:212
-#: ../../../www/admin/service/index.php:223
-msgid "LDAP Error: failed to modify kolab configuration object: "
-msgstr "LDAP fout: bijwerken van het Kolab configuratie object is mislukt:"
-
-#: ../../../www/admin/service/index.php:230
-msgid "POP3 Service"
-msgstr "POP3 Service"
-
-#: ../../../www/admin/service/index.php:231
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "POP3/SSL service (TCP poort 995)"
-
-#: ../../../www/admin/service/index.php:232
-msgid "IMAP Service"
-msgstr "IMAP Service"
-
-#: ../../../www/admin/service/index.php:233
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "IMAP/SSL Service (TCP poort 993)"
-
-#: ../../../www/admin/service/index.php:234
-msgid "Sieve service (TCP port 2000)"
-msgstr "Sieve service (TCP poort 2000)"
-
-#: ../../../www/admin/service/index.php:236
-msgid "FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
-
-#: ../../../www/admin/service/index.php:238
-msgid "HTTP FreeBusy Service (Legacy)"
-msgstr "HTTP Free/Busy service (vervallen)"
-
-#: ../../../www/admin/service/index.php:239
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Amavis email scannen (virus/anti-spam)"
-
-#: ../../../www/admin/sharedfolder/sf.php:50
-#: ../../../www/admin/sharedfolder/sf.php:57
-msgid "Permission for UID/email/GID"
-msgstr "Toestemming voor UID/e-mail/GID"
-
-#: ../../../www/admin/sharedfolder/sf.php:119
-msgid "Folder Name"
-msgstr "Map naam"
+#: ../../../www/admin/user/user.php:329
+#: ../../../www/admin/sharedfolder/sf.php:111
+#: ../../../www/admin/maintainer/maintainer.php:137
+#: ../../../www/admin/administrator/admin.php:144
+#: ../../../www/admin/distributionlist/list.php:116
+#: ../../../www/admin/addressbook/addr.php:101
+msgid "Error: need valid action to proceed"
+msgstr "Fout: heeft een geldige actie nodig om door te gaan"
-#: ../../../www/admin/sharedfolder/sf.php:122
-msgid "Folder Location"
-msgstr "Map locatie"
+#: ../../../www/admin/user/user.php:340 ../../../www/admin/user/user.php:344
+#: ../../../www/admin/sharedfolder/sf.php:117
+#: ../../../www/admin/maintainer/maintainer.php:143
+#: ../../../www/admin/administrator/admin.php:150
+#: ../../../www/admin/distributionlist/list.php:122
+#: ../../../www/admin/addressbook/addr.php:104
+msgid "Error: You don't have the required Permissions"
+msgstr "Fout: je hebt de nodige toegangsrechten niet"
-#: ../../../www/admin/sharedfolder/sf.php:124
#: ../../../www/admin/user/user.php:353 ../../../www/admin/user/user.php:355
+#: ../../../www/admin/sharedfolder/sf.php:124
msgid "Non volatile"
msgstr "permanent"
-#: ../../../www/admin/sharedfolder/sf.php:126
-msgid "Quota Limit"
-msgstr "Quota limiet"
-
-#: ../../../www/admin/sharedfolder/sf.php:127
-msgid "MBytes (empty for unlimited)"
-msgstr "MBytes (leeg voor onbeperkt)"
-
-#: ../../../www/admin/sharedfolder/sf.php:128
-msgid "Permission for UID/GID"
-msgstr "Toestemming voor UID/GID"
-
-#: ../../../www/admin/sharedfolder/sf.php:151 ../include/menu.php:55
-msgid "Add Shared Folder"
-msgstr "Voeg gedeelde map toe"
-
-#: ../../../www/admin/sharedfolder/sf.php:218
-#: ../../../www/admin/sharedfolder/sf.php:227
-msgid "Shared folder updated"
-msgstr "Gedeelde map bijgewerkt"
-
-#: ../../../www/admin/sharedfolder/sf.php:249
-#: ../../../www/admin/sharedfolder/sf.php:266
-msgid "Modify Shared Folder"
-msgstr "Gedeelde map wijzigen"
-
-#: ../../../www/admin/sharedfolder/sf.php:281
-msgid "Delete Shared Folder"
-msgstr "Gedeelde map verwijderen"
-
-#: ../../../www/admin/sharedfolder/sf.php:290
-msgid "Shared folder "
-msgstr "Gedeelde map"
-
-#: ../../../www/admin/sharedfolder/sf.php:290
-msgid " marked for deletion"
-msgstr "Aangestipt voor verwijdering"
-
-#: ../../../www/admin/user/forward.php:38
-#: ../../../www/admin/user/vacation.php:17
-msgid "Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr "Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
-
-#: ../../../www/admin/user/forward.php:64 ../../../www/admin/user/user.php:58
-msgid "Please enter an email address"
-msgstr "Gelieve een e-mailadresin te geven"
-
-#: ../../../www/admin/user/forward.php:70
-msgid "Script was:"
-msgstr "Script was:"
-
-#: ../../../www/admin/user/user.php:86
-msgid "Email address "
-msgstr "E-mailadres"
-
-#: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102
-msgid " collision <br />"
-msgstr "conflict"
-
-#: ../../../www/admin/user/user.php:102
-msgid "UID "
-msgstr "UID"
+#: ../../../www/admin/user/user.php:354
+#: ../../../www/admin/maintainer/maintainer.php:152
+#: ../../../www/admin/administrator/admin.php:159
+msgid "Leave blank to keep password unchanged"
+msgstr "Laat leeg om wachtwoord niet te wijzigen"
-#: ../../../www/admin/user/user.php:375
+#: ../../../www/admin/user/user.php:377
msgid "Unique Identity (UID)"
msgstr "Unieke identiteit (UID)"
-#: ../../../www/admin/user/user.php:377
+#: ../../../www/admin/user/user.php:379
msgid "Optional - Defaults to Primary Email Address"
msgstr "Optioneel - standaard voor hoofd e-mailadres"
-#: ../../../www/admin/user/user.php:378
+#: ../../../www/admin/user/user.php:380
msgid "Mailbox Home Server"
msgstr "Postvak Home Server"
-#: ../../../www/admin/user/user.php:382
+#: ../../../www/admin/user/user.php:384
msgid "Account Type"
msgstr "Account Type"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "User Account"
msgstr "Gebruikersaccount"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Internal User Account"
msgstr "Interne gebruikersaccount"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Group Account"
msgstr "Group account"
-#: ../../../www/admin/user/user.php:384
+#: ../../../www/admin/user/user.php:386
msgid "Resource Account"
msgstr "Hulpbron account"
-#: ../../../www/admin/user/user.php:386
-msgid "NOTE: An internal user is a user that will not be visible in the address book"
-msgstr "Opmerking: een interne gebruiker is een gebruiker dit niet zichtbaar zal zijn in het adresboek"
+#: ../../../www/admin/user/user.php:388
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+"Opmerking: een interne gebruiker is een gebruiker dit niet zichtbaar zal "
+"zijn in het adresboek"
-#: ../../../www/admin/user/user.php:387
+#: ../../../www/admin/user/user.php:389
msgid "Invitation Policy"
msgstr "Uitnodigingsbeleid"
-#: ../../../www/admin/user/user.php:391
+#: ../../../www/admin/user/user.php:393
msgid "For automatic invitation handling"
msgstr "Voor automatische uitnodigingsafhandeling"
-#: ../../../www/admin/user/user.php:392
+#: ../../../www/admin/user/user.php:394
msgid ""
"NOTE: For regular accounts to use this feature, give the 'calendar' user "
"access to the Calendar folder"
-msgstr "Opmerking: reguliere accounts die deze functie willen gebruiken, moeten toegang hebben tot de kalendermap"
+msgstr ""
+"Opmerking: reguliere accounts die deze functie willen gebruiken, moeten "
+"toegang hebben tot de kalendermap"
-#: ../../../www/admin/user/user.php:394
+#: ../../../www/admin/user/user.php:396
msgid "Email Aliases"
msgstr "E-mail Aliases"
-#: ../../../www/admin/user/user.php:398
+#: ../../../www/admin/user/user.php:399
+#: ../../../www/admin/addressbook/addr.php:123
+msgid "One address per line"
+msgstr "Een adres per lijn"
+
+#: ../../../www/admin/user/user.php:400
msgid "Delegates"
msgstr "Machtiging"
-#: ../../../www/admin/user/user.php:401
+#: ../../../www/admin/user/user.php:403
msgid "One Email address per line"
msgstr "Een e-mail adres per lijn"
-#: ../../../www/admin/user/user.php:413
+#: ../../../www/admin/user/user.php:415
msgid "User Quota in MBytes"
msgstr "Beschikbare schijfruimte in MBytes per gebruiker "
-#: ../../../www/admin/user/user.php:425
+#: ../../../www/admin/user/user.php:427
msgid "Free/Busy interval in days"
msgstr "Free/Busy interval in dagen"
-#: ../../../www/admin/user/user.php:426
+#: ../../../www/admin/user/user.php:428
msgid "Leave blank for default (60 days)"
msgstr "Laat leeg voor standaard (60 dagen)"
-#: ../../../www/admin/user/user.php:475
+#: ../../../www/admin/user/user.php:477
msgid "Could not encrypt password: "
msgstr "Kon wachtwoord niet versleutelen:"
-#: ../../../www/admin/user/user.php:570
+#: ../../../www/admin/user/user.php:572
msgid ""
"Account DN could not be modified, distribution list <a href='/admin/"
"distributionlist/list.php?action=modify&dn="
msgstr ""
-"DN account kon niet gewijzigd worden, distributielijst "
-"<a href='/admin/"
+"DN account kon niet gewijzigd worden, distributielijst <a href='/admin/"
"distributionlist/list.php?action=modify&dn="
-#: ../../../www/admin/user/user.php:647 ../../../www/admin/user/user.php:722
+#: ../../../www/admin/user/user.php:649 ../../../www/admin/user/user.php:724
msgid "Modify User"
msgstr "Gebruiker wijzigen"
-#: ../../../www/admin/user/user.php:695
+#: ../../../www/admin/user/user.php:697
msgid "User "
msgstr "Gebruiker"
-#: ../../../www/admin/user/user.php:696 ../../../www/admin/user/user.php:702
-#: ../../../www/admin/user/user.php:713 ../include/menu.php:30
+#: ../../../www/admin/user/user.php:697
+#: ../../../www/admin/maintainer/maintainer.php:278
+#: ../../../www/admin/administrator/admin.php:285
+msgid " successfully created"
+msgstr "Creatie succesvol"
+
+#: ../../../www/admin/user/user.php:698 ../../../www/admin/user/user.php:704
+#: ../../../www/admin/user/user.php:715 ../include/menu.php:30
msgid "Create New User"
msgstr "Creëer nieuwe gebruiker"
-#: ../../../www/admin/user/user.php:728 ../../../www/admin/user/user.php:766
+#: ../../../www/admin/user/user.php:730 ../../../www/admin/user/user.php:768
msgid "Delete User"
msgstr "Gebruiker verwijderen"
-#: ../../../www/admin/user/user.php:760
+#: ../../../www/admin/user/user.php:742
+#: ../../../www/admin/maintainer/maintainer.php:323
+#: ../../../www/admin/administrator/admin.php:330
+msgid "Error: need dn for delete operation"
+msgstr "Fout: dn nodig om handeling te verwijderen"
+
+#: ../../../www/admin/user/user.php:744
+#: ../../../www/admin/maintainer/maintainer.php:325
+msgid "Error: you need administrative permissions to delete users"
+msgstr ""
+"Fout: je hebt administratieve rechten nodig om gebruikers te verwijderen"
+
+#: ../../../www/admin/user/user.php:762
msgid "User Deleted"
msgstr "Gebruiker verwijderd"
@@ -1480,65 +1325,311 @@ msgstr "-- \r\n"
msgid "<enter your name and email address here>"
msgstr "<vul hier uw naam en e-mailadres in>"
-#: ../include/auth.class.php:40
-msgid "Server error, no ldap object!"
-msgstr "Serverfout, geen LDAP object"
+#: ../../../www/admin/sharedfolder/sf.php:50
+#: ../../../www/admin/sharedfolder/sf.php:57
+msgid "Permission for UID/email/GID"
+msgstr "Toestemming voor UID/e-mail/GID"
-#: ../include/auth.class.php:45
-msgid "Could not bind to LDAP server: "
-msgstr "Kon geen verbinding maken met LDAP server"
+#: ../../../www/admin/sharedfolder/sf.php:119
+msgid "Folder Name"
+msgstr "Map naam"
-#: ../include/auth.class.php:56
-msgid "Could not bind to LDAP server"
-msgstr "Kon geen verbinding maken met LDAP server"
+#: ../../../www/admin/sharedfolder/sf.php:122
+msgid "Folder Location"
+msgstr "Map locatie"
-#: ../include/auth.class.php:83 ../include/auth.class.php:87
-msgid "Wrong username or password"
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
+#: ../../../www/admin/sharedfolder/sf.php:126
+msgid "Quota Limit"
+msgstr "Quota limiet"
-#: ../include/auth.class.php:92
-msgid "Please log in as a valid user"
-msgstr "Gelieve aan te melden als een geldige gebruiker"
+#: ../../../www/admin/sharedfolder/sf.php:127
+msgid "MBytes (empty for unlimited)"
+msgstr "MBytes (leeg voor onbeperkt)"
-#: ../include/form.class.php:60
-msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
-msgstr "<tr><th>Atribuut</th>"
+#: ../../../www/admin/sharedfolder/sf.php:128
+msgid "Permission for UID/GID"
+msgstr "Toestemming voor UID/GID"
-#: ../include/form.class.php:179
-msgid "Always accept"
-msgstr "Altijd accepteren"
+#: ../../../www/admin/sharedfolder/sf.php:151 ../include/menu.php:55
+msgid "Add Shared Folder"
+msgstr "Voeg gedeelde map toe"
-#: ../include/form.class.php:180
-msgid "Always reject"
-msgstr "Altijd afwijzen"
+#: ../../../www/admin/sharedfolder/sf.php:218
+#: ../../../www/admin/sharedfolder/sf.php:227
+msgid "Shared folder updated"
+msgstr "Gedeelde map bijgewerkt"
-#: ../include/form.class.php:181
-msgid "Reject if conflicts"
-msgstr "Afwijzen bij conflicten"
+#: ../../../www/admin/sharedfolder/sf.php:249
+#: ../../../www/admin/sharedfolder/sf.php:266
+msgid "Modify Shared Folder"
+msgstr "Gedeelde map wijzigen"
-#: ../include/form.class.php:182
-msgid "Manual if conflicts"
-msgstr "Handmatig bij conflicten"
+#: ../../../www/admin/sharedfolder/sf.php:281
+msgid "Delete Shared Folder"
+msgstr "Gedeelde map verwijderen"
-#: ../include/form.class.php:183
-msgid "Manual"
-msgstr "Handmatig"
+#: ../../../www/admin/sharedfolder/sf.php:290
+msgid "Shared folder "
+msgstr "Gedeelde map"
-#: ../include/form.class.php:229
-msgid "Required field "
-msgstr "Vereiste veld"
+#: ../../../www/admin/sharedfolder/sf.php:290
+msgid " marked for deletion"
+msgstr "Aangestipt voor verwijdering"
-#: ../include/form.class.php:229
-msgid " is empty"
-msgstr " is leeg"
+#: ../../../www/admin/sharedfolder/sf.php:291
+#: ../../../www/admin/distributionlist/list.php:311
+#: ../../../www/admin/addressbook/addr.php:285
+msgid "Entry Deleted"
+msgstr "Entry verwijderd"
-#: ../include/ldap.class.php:53
-msgid "Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr "Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw systeembeheerder "
+#: ../../../www/admin/service/index.php:132
+#: ../../../www/admin/service/index.php:141
+#: ../../../www/admin/service/index.php:150
+#: ../../../www/admin/service/index.php:159
+#: ../../../www/admin/service/index.php:169
+#: ../../../www/admin/service/index.php:178
+#: ../../../www/admin/service/index.php:189
+#: ../../../www/admin/service/index.php:203
+#: ../../../www/admin/service/index.php:218
+#: ../../../www/admin/service/index.php:230
+#: ../../../www/admin/service/index.php:245
+#: ../../../www/admin/service/index.php:258
+msgid "LDAP Error: failed to modify kolab configuration object: "
+msgstr "LDAP fout: bijwerken van het Kolab configuratie object is mislukt:"
-#: ../include/ldap.class.php:308
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP fout: Can't read maintainers group"
+#: ../../../www/admin/service/index.php:265
+msgid "POP3 Service"
+msgstr "POP3 Service"
+
+#: ../../../www/admin/service/index.php:266
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "POP3/SSL service (TCP poort 995)"
+
+#: ../../../www/admin/service/index.php:267
+msgid "IMAP Service"
+msgstr "IMAP Service"
+
+#: ../../../www/admin/service/index.php:268
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "IMAP/SSL Service (TCP poort 993)"
+
+#: ../../../www/admin/service/index.php:269
+msgid "Sieve service (TCP port 2000)"
+msgstr "Sieve service (TCP poort 2000)"
+
+#: ../../../www/admin/service/index.php:271
+msgid "FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
+
+#: ../../../www/admin/service/index.php:273
+msgid "HTTP FreeBusy Service (Legacy)"
+msgstr "HTTP Free/Busy service (vervallen)"
+
+#: ../../../www/admin/service/index.php:274
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Amavis email scannen (virus/anti-spam)"
+
+#: ../../../www/admin/maintainer/index.php:59
+msgid "Manage Maintainers ("
+msgstr "Beheer van de Maintainers("
+
+#: ../../../www/admin/maintainer/index.php:59
+msgid " Maintainers)"
+msgstr "Maintainers)"
+
+#: ../../../www/admin/maintainer/maintainer.php:51
+#: ../../../www/admin/administrator/admin.php:51
+msgid "Account with this UID already exists"
+msgstr "Account met deze UID bestaat reeds"
+
+#: ../../../www/admin/maintainer/maintainer.php:151
+#: ../../../www/admin/administrator/admin.php:158
+msgid "non volatile"
+msgstr "permanent"
+
+#: ../../../www/admin/maintainer/maintainer.php:169
+#: ../../../www/admin/administrator/admin.php:176
+msgid "Unique User ID"
+msgstr "Unieke gebruikers ID"
+
+#: ../../../www/admin/maintainer/maintainer.php:259
+#: ../../../www/admin/maintainer/maintainer.php:305
+msgid "Modify Maintainer"
+msgstr "Maintainers wijzigen"
+
+#: ../../../www/admin/maintainer/maintainer.php:260
+#: ../../../www/admin/maintainer/maintainer.php:278
+msgid "Maintainer "
+msgstr "Maintainers"
+
+#: ../../../www/admin/maintainer/maintainer.php:260
+#: ../../../www/admin/administrator/admin.php:265
+msgid " successfully modified"
+msgstr "Wijziging succesvol"
+
+#: ../../../www/admin/maintainer/maintainer.php:279
+#: ../../../www/admin/maintainer/maintainer.php:285
+#: ../../../www/admin/maintainer/maintainer.php:296 ../include/menu.php:79
+msgid "Create New Maintainer"
+msgstr "Maintainers aanmaken"
+
+#: ../../../www/admin/maintainer/maintainer.php:311
+msgid "Delete Maintainer"
+msgstr "Maintainers verwijderen"
+
+#: ../../../www/admin/maintainer/maintainer.php:341
+msgid "Maintainer Deleted"
+msgstr "Maintainer verwijderd"
+
+#: ../../../www/admin/administrator/admin.php:98
+msgid "Manager's password can't be changed from the webgui"
+msgstr "Managers wachtwoord kan niet gewijzigd worden via de webgui"
+
+#: ../../../www/admin/administrator/admin.php:264
+#: ../../../www/admin/administrator/admin.php:312
+msgid "Modify Administrator"
+msgstr "Wijzig Administrator"
+
+#: ../../../www/admin/administrator/admin.php:265
+#: ../../../www/admin/administrator/admin.php:285
+msgid "Administrator "
+msgstr "Administrator "
+
+#: ../../../www/admin/administrator/admin.php:286
+#: ../../../www/admin/administrator/admin.php:292
+#: ../../../www/admin/administrator/admin.php:303 ../include/menu.php:71
+msgid "Create New Administrator"
+msgstr "Creëer nieuwe Administrator"
+
+#: ../../../www/admin/administrator/admin.php:318
+msgid "Delete Administrator"
+msgstr "Verwijder Administrator"
+
+#: ../../../www/admin/administrator/admin.php:332
+msgid "Error: you need administrative permissions to delete administrators"
+msgstr ""
+"Fout : je hebt administratieve toegangsrechten nodig om administrators te "
+"verwijderen"
+
+#: ../../../www/admin/administrator/admin.php:346
+msgid "Administrator Deleted"
+msgstr "Administrator verwijderd"
+
+#: ../../../www/admin/administrator/index.php:60
+msgid "Manage Administrators ("
+msgstr "Beheer Administrators ("
+
+#: ../../../www/admin/administrator/index.php:60
+msgid " Administrators)"
+msgstr "Administrators)"
+
+#: ../../../www/admin/distributionlist/list.php:45
+msgid "Please add at least one member"
+msgstr "Gelieve tenminste een lid toe te voegen"
+
+#: ../../../www/admin/distributionlist/list.php:71
+msgid "User or distribution list with this email address already exists"
+msgstr "Gebruiker of distributielijst met dit e-mailadres bestaat al"
+
+#: ../../../www/admin/distributionlist/list.php:124
+msgid "List Name"
+msgstr "Lijstnaam"
+
+#: ../../../www/admin/distributionlist/list.php:127
+msgid "Members"
+msgstr "Leden"
+
+#: ../../../www/admin/distributionlist/list.php:129
+msgid "One email address per line"
+msgstr "Een e-mailadres per lijn"
+
+#: ../../../www/admin/distributionlist/list.php:132
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: ../../../www/admin/distributionlist/list.php:135
+msgid ""
+"Check here to make this distribution list available only to authenticated "
+"users"
+msgstr ""
+"Kruis hier aan om de distribitielijst beschikbaar allen voor authoriseerde "
+"gebruikers"
+
+#: ../../../www/admin/distributionlist/list.php:154
+msgid "Add Distribution List"
+msgstr "Voeg distributielijst toe"
+
+#: ../../../www/admin/distributionlist/list.php:207
+#: ../../../www/admin/distributionlist/list.php:216
+msgid "Distribution List updated"
+msgstr "Distributielijst geüpdatet"
+
+#: ../../../www/admin/distributionlist/list.php:265
+#: ../../../www/admin/distributionlist/list.php:281
+msgid "Modify Distribution List"
+msgstr "Distributielijst wijzigen"
+
+#: ../../../www/admin/distributionlist/list.php:299
+msgid "Delete Distribution List"
+msgstr "Distributielijst verwijderen"
+
+#: ../../../www/admin/distributionlist/list.php:310
+msgid "Distribution List "
+msgstr "Distributielijst"
+
+#: ../../../www/admin/distributionlist/list.php:310
+msgid " deleted"
+msgstr "verwijderd"
+
+#: ../../../www/admin/distributionlist/index.php:62
+msgid "not yet implemented"
+msgstr "nog niet geïmplementeerd"
+
+#: ../../../www/admin/addressbook/addr.php:118
+msgid "Primary E-Mail Address"
+msgstr "Hoofd e-mailadres"
+
+#: ../../../www/admin/addressbook/addr.php:120
+msgid "E-Mail Aliases"
+msgstr "E-Mail Aliassen"
+
+#: ../../../www/admin/addressbook/addr.php:128
+msgid "Post Box"
+msgstr "Postnummer"
+
+#: ../../../www/admin/addressbook/addr.php:152
+msgid "Add External Address"
+msgstr "Extern adres toevoegen"
+
+#: ../../../www/admin/addressbook/addr.php:196
+msgid "LDAP Error: could not rename "
+msgstr "LDAP fout: kon naam niet wijzigen"
+
+#: ../../../www/admin/addressbook/addr.php:203
+msgid "LDAP Error: could not read "
+msgstr "LDAP fout: leesfout"
+
+#: ../../../www/admin/addressbook/addr.php:207
+msgid "LDAP Error: could not modify object "
+msgstr "LDAP fout: kon het object niet aanpassen"
+
+#: ../../../www/admin/addressbook/addr.php:218
+msgid "LDAP Error: could not add object "
+msgstr "LDAP fout: kon geen object toevoegen"
+
+#: ../../../www/admin/addressbook/addr.php:230
+#: ../../../www/admin/addressbook/addr.php:250
+msgid "Modify External Address"
+msgstr "Pas extern adres aan"
+
+#: ../../../www/admin/addressbook/addr.php:273
+msgid "Delete External Address"
+msgstr "Verwijder extern adres "
+
+#: ../../../www/admin/addressbook/addr.php:283
+msgid "LDAP Error: could not delete "
+msgstr "LDAP fout: kon niet verwijderen"
#: ../include/menu.php:26
msgid "Users"
@@ -1640,3 +1731,77 @@ msgstr "KDE1"
msgid "<b>Versions</b>"
msgstr "<b>Versies</b>"
+#: ../include/form.class.php:60
+msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
+msgstr "<tr><th>Atribuut</th>"
+
+#: ../include/form.class.php:137
+msgid "Yes"
+msgstr ""
+
+#: ../include/form.class.php:137
+msgid "No"
+msgstr ""
+
+#: ../include/form.class.php:206
+msgid "Always accept"
+msgstr "Altijd accepteren"
+
+#: ../include/form.class.php:207
+msgid "Always reject"
+msgstr "Altijd afwijzen"
+
+#: ../include/form.class.php:208
+msgid "Reject if conflicts"
+msgstr "Afwijzen bij conflicten"
+
+#: ../include/form.class.php:209
+msgid "Manual if conflicts"
+msgstr "Handmatig bij conflicten"
+
+#: ../include/form.class.php:210
+msgid "Manual"
+msgstr "Handmatig"
+
+#: ../include/form.class.php:216 ../include/form.class.php:222
+msgid "Anyone"
+msgstr ""
+
+#: ../include/form.class.php:278 ../include/form.class.php:281
+msgid "Required field "
+msgstr "Vereiste veld"
+
+#: ../include/form.class.php:278 ../include/form.class.php:281
+msgid " is empty"
+msgstr " is leeg"
+
+#: ../include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Serverfout, geen LDAP object"
+
+#: ../include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "Kon geen verbinding maken met LDAP server"
+
+#: ../include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "Kon geen verbinding maken met LDAP server"
+
+#: ../include/auth.class.php:83 ../include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Verkeerde gebruikersnaam of wachtwoord"
+
+#: ../include/auth.class.php:92
+msgid "Please log in as a valid user"
+msgstr "Gelieve aan te melden als een geldige gebruiker"
+
+#: ../include/ldap.class.php:53
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw "
+"systeembeheerder "
+
+#: ../include/ldap.class.php:308
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "LDAP fout: Can't read maintainers group"
diff --git a/php/admin/templates/domainmaintainerlistall.tpl b/php/admin/templates/domainmaintainerlistall.tpl
new file mode 100644
index 0000000..a6b47c1
--- /dev/null
+++ b/php/admin/templates/domainmaintainerlistall.tpl
@@ -0,0 +1,28 @@
+{* Smarty Template *}
+{*
+ Local variables:
+ buffer-file-coding-system: utf-8
+ End:
+*}
+<div class="contenttext">
+
+</div>
+
+<table class="contenttable" cellpadding="0" cellspacing="1px">
+ <tr class="contentrow">
+ <th>{tr msg="Name"}</th><th>{tr msg="UID"}</th><th>Domains</th><th colspan="2">{tr msg="Action"}</th>
+ </tr>
+{section name=id loop=$entries}
+ <tr class="contentrow{cycle values="even,odd"}">
+ <td class="contentcell">{$entries[id].sn|escape:"html"}, {$entries[id].fn|escape:"html"}</td>
+ <td class="contentcell">{$entries[id].uid|escape:"html"}</td>
+ <td class="contentcell">{$entries[id].domains|escape:"html"}</td>
+ {if $entries[id].deleted neq "FALSE"}
+ <td class="actioncell" colspan="2">{tr msg="Object Deleted, awaiting cleanup..."}</td>
+ {else}
+ <td class="actioncell"><a href="maintainer.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+ <td class="actioncell"><a href="maintainer.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+ {/if}
+ </tr>
+{/section}
+</table>
diff --git a/php/admin/templates/service.tpl b/php/admin/templates/service.tpl
index cbb6d17..3ea31be 100755
--- a/php/admin/templates/service.tpl
+++ b/php/admin/templates/service.tpl
@@ -103,6 +103,31 @@
</form>
</div>
<br />
+<h2>{tr msg="Domains"}</h2>
+<table class="contenttable" cellpadding="0" cellspacing="1px">
+ <tr class="contentrow">
+ <th>{tr msg="Domain"}</th><th>{tr msg="Action"}</th>
+ </tr>
+{section name=id loop=$postfixmydestination}
+ <tr class="contentrow{cycle values="even,odd"}">
+ <td class="contentcell">{$postfixmydestination[id]|escape:"html"}</td>
+ <td class="actioncell">{strip}
+ <form method="post">
+ <input type="hidden" name="adestination" value="{$postfixmydestination[id]}" />
+ <input type="submit" name="deletedestination" value="{tr msg="Delete"}" />
+ </form>
+ {/strip}</td>
+ </tr>
+{/section}
+ <tr class="contentrow{cycle values="even,odd"}">
+ <form method="post">
+ <td class="contentcell">
+ <input type="text" size="60" name="adestination" />
+ </td><td class="actioncell"><input type="submit" name="adddestination" value="{tr msg="Add"}" /></td>
+ </form>
+ </tr>
+</table>
+<br/>
<h2>{tr msg="Mail Filter Settings"}</h2>
<div class="contentform">
<form name="kolabfilterform" method="post">
diff --git a/www/admin/domainmaintainer/domainmaintainer.php b/www/admin/domainmaintainer/domainmaintainer.php
new file mode 100644
index 0000000..0b73a72
--- /dev/null
+++ b/www/admin/domainmaintainer/domainmaintainer.php
@@ -0,0 +1,362 @@
+<?php
+/*
+ * Copyright (c) 2005 Klarälvdalens Datakonsult AB
+ *
+ * Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+require_once('admin/include/form.class.php');
+
+/**** Functions ***/
+function comment( $s ) {
+ return $s;
+}
+
+function is_unique ($a, $b) {
+ global $ldap;
+ if (($result = $ldap->search( $_SESSION['base_dn'],"(".$a."=".$ldap->escape($b).")")) &&
+ (ldap_count_entries($ldap->connection,$result) <= 0))
+ return true;
+ return false;
+}
+
+function domain_dn()
+{
+ return $_SESSION['base_dn'];
+}
+
+// Check that a uid is unique
+function checkuniquemail( $form, $key, $value ) {
+ debug("checkuniquemail( $form, $key, $value )");
+ if( is_unique( 'uid', $value ) ) {
+ return '';
+ } else {
+ return _('Account with this UID already exists');
+ }
+}
+
+// Check that password match
+function checkpw( $form, $key, $value ) {
+ global $action;
+ if( $action == "firstsave" ) {
+ if( $key == 'password_0' ) {
+ if( $value == '' ) return _('Password is empty');
+ } else if( $key == 'password_1' ) {
+ if( $value != $_POST['password_0'] ) {
+ return _('Passwords dont match');
+ }
+ }
+ } else {
+ if( $value != $_POST['password_0'] ) {
+ return _('Passwords dont match');
+ }
+ }
+ return '';
+}
+function fill_form_for_modify( &$form, &$ldap_object ) {
+ global $ldap;
+ if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];
+ else $lastname = $ldap_object['sn'];
+ if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
+ else $cn = $ldap_object['cn'];
+ if ($lastname) {
+ $a = strlen($lastname);
+ if ($cn) {
+ $b = strlen($cn);
+ $firstname = substr($cn, 0, $b - $a);
+ }
+ }
+ if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
+ else $uid = $ldap_object['uid'];
+ $form->entries['firstname']['value'] = $firstname;
+ $form->entries['lastname']['value'] = $lastname;
+ $form->entries['password_0']['value'] = '';
+ $form->entries['password_1']['value'] = '';
+ $form->entries['uid']['value'] = $uid;
+ $form->entries['uid']['attrs'] = 'readonly';
+ $form->entries['domains']['value'] = $ldap->domainsForMaintainerUid($uid);
+}
+
+/**** Authentication etc. ***/
+$sidx = 'domain-maintainer';
+
+require_once('admin/include/menu.php');
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Logic ***/
+$errors = array();
+$messages = array();
+$valid_actions = array('save','firstsave','modify','create','delete','kill');
+$contenttemplate = 'formcontainer.tpl';
+
+// Get request data
+if (!empty($_REQUEST['action']) &&
+ in_array($_REQUEST['action'],$valid_actions)) $action = trim(urldecode($_REQUEST['action']));
+else array_push($errors, _("Error: need valid action to proceed"));
+$dn="";
+if (!empty($_REQUEST['dn'])) $dn = trim(urldecode($_REQUEST['dn']));
+
+// Check auth
+if (!$errors && $auth->group() != 'admin' && $auth->group() != 'maintainer' ) {
+ array_push($errors, _("Error: You don't have the required Permissions"));
+}
+
+// Fill in data
+if ($action == "create") {
+ $comment_mail_0 = _('Required, non volatile');
+ $comment_password = _('Required');
+} else {
+ $comment_mail_0 = _('non volatile');
+ $comment_password = _('Leave blank to keep password unchanged');
+}
+
+$entries = array( 'firstname' => array( 'name' => _('First Name'),
+ 'validation' => 'notempty',
+ 'comment' => _('Required') ),
+ 'lastname' => array( 'name' => _('Last Name'),
+ 'validation' => 'notempty',
+ 'comment' => _('Required') ),
+ 'password_0' => array( 'name' => _('Password'),
+ 'type' => 'password',
+ 'validation' => 'checkpw',
+ 'comment' => $comment_password ),
+ 'password_1' => array( 'name' => _('Verify Password'),
+ 'type' => 'password',
+ 'validation' => 'checkpw',
+ 'comment' => $comment_password ),
+ 'uid' => array( 'name' => _('Unique User ID'),
+ 'validation' => 'notempty',
+ 'comment' => $comment_mail_0 ),
+ 'domains' => array( 'name' => _("Domains"),
+ 'type' => "checklist",
+ 'comment' => _("Check domains this domain maintainer should be able to maintain"),
+ 'options' => $ldap->domains())
+);
+
+$entries['action'] = array( 'name' => 'action',
+ 'type' => 'hidden' );
+
+if( $dn ) {
+ $ldap_object = $ldap->read( $dn );
+ if( !$ldap_object ) {
+ array_push($errors, _("LDAP Error: No such dn: $dn: ").ldap_error($ldap->connection));
+ }
+}
+
+$form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
+/***************** Main action swicth **********************/
+switch( $action ) {
+ case 'firstsave':
+ debug("adding checkuniquemail to validation");
+ $form->entries['uid']['validation'] = 'checkuniquemail';
+ case 'save':
+ if( $form->isSubmitted() ) {
+ if( !$form->validate() ) {
+ $form->setValues();
+ $content = $form->outputForm();
+ } else {
+ $ldap_object = array();
+ $ldap_object['objectClass'] = array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson');
+ $ldap_object['sn'] = trim($_POST['lastname']);
+ $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
+ if( !empty( $_POST['password_0'] ) ) {
+ $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*',
+ sha1( $_POST['password_0'])));
+ }
+ if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
+
+ #debug_var_dump( $ldap_object );
+
+ $domain_dn = domain_dn();
+ $olddomains = $ldap->domainsForMaintainerDn($dn);
+
+ if ($action == "save") {
+ if (!$errors) {
+ if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+ else $newdn = $dn;
+ if (!$visible && !strstr($newdn,$dn_add)) {
+ list($cn,$rest) = split(',', $newdn, 2);
+ $newdn = $cn.$dn_add.",".$rest;
+ }
+ if (strcmp($dn,$newdn) != 0) {
+ if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
+ ($entry=ldap_first_entry($ldap->connection,$result)) &&
+ ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
+ $ldap_object['uid'] = $oldattrs['uid'][0];
+ if( empty($ldap_object['userPassword']) )
+ $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
+ if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
+ array_push($errors, _("LDAP Error: could not rename $dn to $newdn: ")
+ .ldap_error($ldap->connection));
+ if( !$errors ) {
+ if( !ldap_delete($ldap->connection,$dn)) {
+ array_push($errors, _("LDAP Error: could not remove old entry $dn: ")
+ .ldap_error($ldap->connection));
+ }
+ }
+ if( !$errors ) {
+ // Update maintainer group
+ $groupdn = 'cn=domain-maintainer,cn=internal,'.$domain_dn;
+ if( !ldap_mod_add( $ldap->connection,
+ $groupdn,
+ array( 'member' => $newdn ) ) ) {
+ $errors[] = _("LDAP Error: Could not add new group entry $newdn: ")
+ .ldap_error($ldap->connection);
+ }
+ if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
+ array( 'member' => $dn ) ) ) {
+ $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
+ .ldap_error($ldap->connection);
+ }
+ if( !$errors ) {
+ $domains = $ldap->domainsForMaintainerDn($dn);
+ $ldap->removeFromDomainGroups( $dn, $domains );
+ $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
+ }
+ }
+ $dn = $newdn;
+ } else array_push($errors,_("LDAP Error: could not read $dn ")
+ .ldap_error($ldap->connection));
+ } else {
+ if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
+ array_push($errors, _("LDAP Error: could not modify object $dn ")
+ .ldap_error($ldap->connection));
+ }
+ if( !$errors ) {
+ $domains = $ldap->domainsForMaintainerDn($dn);
+ $remove_domains = array_diff($domains,$_POST['domains']);
+ $ldap->removeFromDomainGroups( $dn, $remove_domains );
+ $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
+ }
+ }
+ }
+ $heading = _('Modify Domain Maintainer');
+ $messages[] = _('Maintainer ').$ldap_object['dn']._(' successfully modified');
+ $form->setValues();
+ $form->entries['action']['value'] = 'save';
+ } else {
+ // firstsave
+ if (!$errors) {
+ $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+ debug("Calling ldap_add with dn=$dn");
+ if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
+ array_push($errors, _("LDAP Error: could not add object $dn: ").ldap_error($ldap->connection));
+ if( $dn && !ldap_mod_add($ldap->connection, 'cn=domain-maintainer,cn=internal,'.$domain_dn,
+ array( 'member' => $dn ) ) ) {
+ array_push($errors, _("LDAP Error: could not add object $dn to maintainer group: ")
+ .ldap_error($ldap->connection));
+ }
+ if( $dn && !$errors ) {
+ $ldap->addToDomainGroups( $dn, $_POST['domains'] );
+ }
+ if( !$errors ) {
+ $messages[] = _('Domain maintainer ').$ldap_object['dn']._(' successfully created');
+ $heading = _('Create New Domain Maintainer');
+ $form->entries['action']['value'] = 'firstsave';
+ }
+ } else {
+ $heading = _('Create New Domain Maintainer');
+ $blacklist = array('mail');
+ $form->entries['action']['value'] = 'firstsave';
+ }
+ }
+ }
+ $content = $form->outputForm();
+ break;
+ }
+ case 'create':
+ $heading = _('Create New Domain Maintainer');
+ if( !$dn ) {
+ $form->entries['action']['value'] = 'firstsave';
+ } else {
+ $form->entries['action']['value'] = 'save';
+ }
+ $content = $form->outputForm();
+ break;
+ case 'modify':
+ $heading = _('Modify Domain Maintainer');
+ fill_form_for_modify( $form, $ldap_object );
+ $form->entries['action']['value'] = 'save';
+ $content = $form->outputForm();
+ break;
+ case 'delete':
+ $heading = _('Delete Domain Maintainer');
+ foreach( $form->entries as $k => $v ) {
+ if( $v['type'] != 'hidden' ) {
+ $form->entries[$k]['attrs'] = 'readonly';
+ }
+ }
+ fill_form_for_modify( $form, $ldap_object );
+ $form->entries['action']['value'] = 'kill';
+ $form->submittext = 'Delete';
+ $content = $form->outputForm();
+ break;
+ case 'kill':
+ if (!$dn) array_push($errors, _("Error: need dn for delete operation"));
+ elseif ($auth->group() != "maintainer" && $auth->group() != "admin")
+ array_push($errors, _("Error: you need administrative permissions to delete domain maintainers"));
+
+ if (!$errors) {
+ if(!ldap_mod_del($ldap->connection, 'cn=domain-maintainer,cn=internal,'.domain_dn(), array('member' => $dn ) )) {
+ $errors[] = _("LDAP Error: Could not remove $dn from maintainer group: ")
+ .ldap_error($ldap->connection);
+ }
+ if( !$errors ) {
+ $delete_template['kolabdeleteflag'] = 'TRUE';
+ if( !$ldap->deleteObject($dn)) {
+ array_push($errors, _("LDAP Error: could not mark $dn for deletion ")
+ .ldap_error($ldap->connection));
+ }
+ }
+ }
+ if( !$errors ) {
+ $heading = _('Domain Maintainer Deleted');
+ $contenttemplate = 'maintainerdeleted.tpl';
+ }
+ break;
+}
+
+
+$smarty = new MySmarty();
+$smarty->assign( 'topdir', $topdir );
+$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems',
+ array_key_exists('submenu',
+ $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
+$smarty->assign( 'heading', $heading );
+$smarty->assign( 'form', $content );
+if( isset( $dn ) ) $smarty->assign( 'dn', $dn );
+if( count($messages)>0) $smarty->assign( 'messages', $messages );
+$smarty->assign( 'maincontent', $contenttemplate );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+ */
+?>
diff --git a/www/admin/domainmaintainer/index.php b/www/admin/domainmaintainer/index.php
new file mode 100644
index 0000000..f21bb3b
--- /dev/null
+++ b/www/admin/domainmaintainer/index.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright (c) 2005 Klarälvdalens Datakonsult AB
+ *
+ * Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
+require_once('admin/include/mysmarty.php');
+require_once('admin/include/headers.php');
+require_once('admin/include/locale.php');
+require_once('admin/include/authenticate.php');
+
+$errors = array();
+
+/**** Authentication etc. ***/
+$sidx = 'domain-maintainer';
+
+if( $auth->group() != 'admin' ) {
+ array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+}
+
+require_once('admin/include/menu.php');
+
+/**** Submenu for current page ***/
+$menuitems[$sidx]['selected'] = 'selected';
+
+/**** Extract data from LDAP ***/
+
+// read selector for register display
+if (isset($HTTP_GET_VARS['alphaselect'])) $alphaselect = $HTTP_GET_VARS['alphaselect'];
+else $alphaselect = "[A-F]";
+if (isset($HTTP_GET_VARS['page'])) $page = $HTTP_GET_VARS['page'];
+else $page = "1";
+
+// Get all entries & dynamically split the letters with growing entries
+if( !$errors ) {
+ if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
+ else $base_dn = 'k=kolab';
+
+ $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'domain-maintainer' );
+
+ $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+
+ if( $result ) {
+ $title = _('Manage Maintainers (').count($maintainers)._(' Maintainers)');
+ // if there are more than 2000 entries, split in 26 categories for every letter,
+ // or if more than 50, put in groups, or else just show all.
+ if (false && $count > 2000) {
+ // ... TODO
+ $template = 'maintainerlistalpha.tpl';
+ } else if( false && $count > 50 ) {
+ // ... TODO
+ $template = 'maintainerlistgroup.tpl';
+ } else {
+ $template = 'domainmaintainerlistall.tpl';
+ $starttime = getmicrotime();
+ ldap_sort($ldap->connection,$result,'sn');
+ $endtime = getmicrotime();
+ //print "sorting took ".($endtime-$starttime)."<br/>";
+ $entry = ldap_first_entry($ldap->connection, $result);
+ while( $entry ) {
+ $attrs = ldap_get_attributes($ldap->connection, $entry);
+ $dn = ldap_get_dn($ldap->connection,$entry);
+ $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+ $userid = $attrs['uid'][0];
+ $sn = $attrs['sn'][0];
+ $cn = $attrs['cn'][0];
+ $a = strlen($sn);
+ $b = strlen($cn);
+ $fn = substr($cn, 0, $b - $a);
+ // skip admins and maintainers
+ if( array_key_exists( $dn, $maintainers ) ) {
+ $domains = $ldap->domainsForMaintainerDn($dn);
+ $entries[] = array( 'dn' => $dn,
+ 'sn' => $sn,
+ 'fn' => $fn,
+ 'uid' => $userid,
+ 'domains' => join(' ', $domains),
+ 'deleted' => $deleted );
+ }
+ $entry = ldap_next_entry( $ldap->connection,$entry );
+ }
+ }
+ }
+}
+
+/**** Insert into template and output ***/
+$smarty = new MySmarty();
+$smarty->assign( 'errors', $errors );
+$smarty->assign( 'uid', $auth->uid() );
+$smarty->assign( 'group', $auth->group() );
+$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
+$smarty->assign( 'entries', $entries );
+$smarty->assign( 'menuitems', $menuitems );
+$smarty->assign( 'submenuitems',
+ array_key_exists('submenu',
+ $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
+$smarty->assign( 'maincontent', $template );
+$smarty->display('page.tpl');
+
+/*
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+ */
+?>
diff --git a/www/admin/service/index.php b/www/admin/service/index.php
index d9e2896..921c367 100644
--- a/www/admin/service/index.php
+++ b/www/admin/service/index.php
@@ -42,6 +42,7 @@ function extract_ldap_values()
global $quotawarn;
global $freebusypast;
global $postfixmydomain;
+ global $postfixmydestination;
global $postfixmynetworks;
global $postfixallowunauth;
global $postfixrelayhost;
@@ -67,6 +68,8 @@ function extract_ldap_values()
$quotawarn = $attrs['cyrus-quotawarn'][0];
$freebusypast = $attrs['kolabFreeBusyPast'][0];
$postfixmydomain = $attrs['postfix-mydomain'][0];
+ $postfixmydestination = $attrs['postfix-mydestination'];
+ unset($postfixmydestination['count']);
unset( $attrs['postfix-mynetworks']['count'] );
$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];
@@ -202,10 +205,37 @@ if( $_REQUEST['submitpostfixrelayhost'] ) {
}
}
+// Delete domain
+if( $_REQUEST['deletedestination'] ) {
+ extract_ldap_values();
+ $key = array_search( trim($_REQUEST['adestination']),$postfixmydestination);
+ if( $key !== false ) {
+ unset( $postfixmydestination[ $key ] );
+ }
+ $attrs = array();
+ $attrs['postfix-mydestination'] = $postfixmydestination;
+ 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);
+ }
+}
+// Add domain
+if( $_REQUEST['adddestination'] ) {
+ extract_ldap_values();
+ if( trim($_REQUEST['adestination']) ) {
+ $postfixmydestination[] = trim($_REQUEST['adestination']);
+ $attrs = array();
+ $attrs['postfix-mydestination'] = $postfixmydestination;
+ 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);
+ }
+ }
+}
+// Delete kolabhost
if( $_REQUEST['deletekolabhost'] ) {
extract_ldap_values();
- $key = array_search($_REQUEST['akolabhost'],$kolabhost);
+ $key = array_search( trim($_REQUEST['akolabhost']),$kolabhost);
if( $key !== false ) {
unset( $kolabhost[ $key ] );
}
@@ -216,6 +246,8 @@ if( $_REQUEST['deletekolabhost'] ) {
.ldap_error($ldap->connection);
}
}
+
+// Add kolabhost
if( $_REQUEST['addkolabhost'] ) {
extract_ldap_values();
if( trim($_REQUEST['akolabhost']) ) {
@@ -260,6 +292,7 @@ $smarty->assign( 'entries', $entries );
$smarty->assign( 'quotawarn', $quotawarn );
$smarty->assign( 'httpallowunauthfb', toboolstr($httpallowunauthfb) );
$smarty->assign( 'freebusypast', $freebusypast );
+$smarty->assign( 'postfixmydestination', $postfixmydestination );
$smarty->assign( 'postfixmynetworks', $postfixmynetworks );
$smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) );
$smarty->assign( 'postfixrelayhost', $postfixrelayhost );
diff --git a/www/admin/user/index.php b/www/admin/user/index.php
index c6f5705..32783df 100644
--- a/www/admin/user/index.php
+++ b/www/admin/user/index.php
@@ -29,8 +29,9 @@ $errors = array();
/**** Authentication etc. ***/
$sidx = 'user';
-if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
- array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group() != 'domain-maintainer' ) {
+ debug("auth->group=".$auth->group());
+ array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
require_once('admin/include/menu.php');
@@ -87,7 +88,18 @@ if( !$errors ) {
default: $alphalimit = '';
}
}
- $filter = "(&($userfilter)$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))";
+ $domains = $ldap->domainsForMaintainerDn($auth->dn());
+ #debug_var_dump($domains);
+ if( is_array($domains) ) {
+ $domainfilter='';
+ foreach( $domains as $dom ) {
+ $domainfilter .= '(mail=*@'.$ldap->escape($dom).')';
+ }
+ if( $domainfilter ) $domainfilter = "(|$domainfilter)";
+ } else {
+ $domainfilter= "";
+ }
+ $filter = "(&($userfilter)$domainfilter$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))";
$result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 77b56b4..182a897 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -54,16 +54,26 @@ function endsWith( $str, $sub ) {
function checkuniquemail( $form, $key, $value ) {
debug("checkuniquemail( $form, $key, $value )");
global $ldap;
+ global $auth;
$value = trim($value);
if( $value == '' ) return _('Please enter an email address');
// Check that we are in the domain
$kolab = $ldap->read( 'k=kolab,'.$_SESSION['base_dn'] );
- $domain = trim($kolab['postfix-mydomain'][0]);
- debug("value=$value, domain=$domain");
- if( !endsWith( $value, '@'.$domain ) ) {
- return _("Email address $value not in domain $domain");
+ if( $auth->group() == 'domain-maintainer' ) {
+ $domains = $ldap->domainsForMaintainerDn($auth->dn());
+ } else {
+ $domains = $kolab['postfix-mydestination'];
+ unset($domains['count']);
+ }
+ debug("value=$value, domain=$domains");
+ $ok = false;
+ foreach( $domains as $domain ) {
+ if( endsWith( $value, '@'.$domain ) ) {
+ $ok = true;
+ }
}
+ if(!$ok) return _("Email address $value not in domains ".join(", ", $domain));
if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) {
return _('User, vCard or distribution list with this email address already exists');
@@ -336,9 +346,13 @@ if( $auth->group() == 'user' ) {
// Check auth
if (!$errors && $auth->group() != 'maintainer' && $auth->group() != 'admin' &&
+ $auth->group() != 'domain-maintainer' &&
!($auth->group() == 'user' && $dn == $auth->dn() )) {
array_push($errors, _("Error: You don't have the required Permissions") );
-}
+} else if( $auth->group() == 'domain-maintainer' ) {
+ // TODO(steffen): Check that user is in correct domain(s)
+}
+
if( !$errors && $auth->group() == 'user' && ($action == 'firstsave' || $action == 'kill' ) ) {
$errors[] = _("Error: You don't have the required Permissions");
@@ -370,8 +384,10 @@ $entries = array( 'givenname' => array( 'name' => _('First Name'),
'validation' => 'checkpw',
'comment' => $comment_password ),
'mail' => array( 'name' => _('Primary Email Address'),
+ 'type' => 'email',
+ 'domains' => $ldap->domains(),
'validation' => 'notempty',
- 'comment' => $comment_mail ),
+ 'comment' => $comment_mail ),
'uid' => array( 'name' => _('Unique Identity (UID)'),
'validation' => 'checkuid',
'comment' => _('Optional - Defaults to Primary Email Address') ),
@@ -483,7 +499,7 @@ switch( $action ) {
}
}
}
- $ldap_object['mail'] = trim( strtolower( $_POST['mail'] ) );
+ $ldap_object['mail'] = trim( strtolower( $_POST['user_mail'] ) ).'@'.trim( strtolower( $_POST['domain_mail'] ) );
$ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
if( $action == 'firstsave' ) {
if ($ldap_object['uid'] == "") $ldap_object['uid'] = $ldap_object['mail'];
@@ -624,10 +640,10 @@ switch( $action ) {
unset($ldap_object['uid']);
unset($ldap_object['kolabHomeServer']);
}
- debug_var_dump($ldap_object);
if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
array_push($errors, _("LDAP Error: Could not modify object $dn: ")
.ldap_error($ldap->connection));
+ debug_var_dump( $ldap_object );
}
}
// Check for collisions on alias