extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ActiveDirectory: optionally also use/import groups of type distribution-list

Browse Source
This commit is contained in:
ralf 2024-01-11 10:47:15 +02:00
parent 27816c1f91
commit c0298bf234
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Accounts/Ads.php
View File

@ -1196,7 +1196,14 @@ class Ads
case 'g':
/** @noinspection SuspiciousAssignmentsInspection */
$type_filter = '(|(samaccounttype=' . adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP .
')(samaccounttype=' . adLDAP::ADLDAP_SECURITY_LOCAL_GROUP . '))';
')(samaccounttype=' . adLDAP::ADLDAP_SECURITY_LOCAL_GROUP;
// should we also consider distribution-lists
if (!empty($this->frontend->config['ads_group_extra_types']) && $this->frontend->config['ads_group_extra_types'] === 'distributionlists')
{
$type_filter .= ')(samaccounttype=' . adLDAP::ADLDAP_DISTRIBUTION_GROUP.
')(samaccounttype=' . adLDAP::ADLDAP_DISTRIBUTION_LOCAL_GROUP;
}
$type_filter .= '))';
if (!empty($this->frontend->config['ads_group_filter']))
{
$type_filter = '(&' . $type_filter . $this->frontend->config['ads_group_filter'] . ')';

1
setup/lang/egw_de.lang
View File

@ -258,6 +258,7 @@ deregistered setup de nicht registriert
details for admin account setup de Details des Admin-Kontos
developers' table schema toy setup de Entwickler Tabellen Schema "Spielzeug"
did not find any valid db support! setup de Konnte keine gültige Datenbankunterstützung finden!
distribution-lists too setup de auch Verteilerlisten
do not check for deleted user setup de Nicht auf gelöschte Benutzer prüfen
do you want persistent connections (higher performance, but consumes more resources) setup de Wollen Sie eine permanente Datenbankverbindung verwenden?<br>(höhere Performance, braucht aber mehr Ressourcen)
do you want to manage homedirectory and loginshell attributes? setup de Wollen Sie Benutzerverzeichnisse und Login-Shell Attribute verwalten?

1
setup/lang/egw_en.lang
View File

@ -258,6 +258,7 @@ deregistered setup en De-registered
details for admin account setup en Details for Admin account
developers' table schema toy setup en Developers' Table Schema Toy
did not find any valid db support! setup en Did not find any valid DB support!
distribution-lists too setup en distribution-lists too
do not check for deleted user setup en Do NOT check for deleted user
do you want persistent connections (higher performance, but consumes more resources) setup en Do you want persistent connections (higher performance, but consumes more resources)
do you want to manage homedirectory and loginshell attributes? setup en Do you want to manage home directory and login shell attributes?

6
setup/templates/default/config.tpl
View File

@ -430,7 +430,11 @@
<td>
{lang_Group_context}: ({lang_leave_empty_to_use_default})
</td>
<td><input name="newsettings[ads_group_context]" value="{value_ads_group_context}" size="80" /></td>
<td>
<input name="newsettings[ads_group_context]" value="{value_ads_group_context}" size="80" />
<label><input type="checkbox" value="distributionlists" {checked_ads_group_extra_types_distributionlists} name="newsettings[ads_group_extra_types]"/>
{lang_distribution-lists too}</label>
</td>
</tr>
<tr class="row_on">
<td>{lang_Additional_user_filter_(optional)}:</td>