|
@@ -104,6 +104,30 @@ class UsersLdapHelper {
|
|
|
|
|
|
|
|
$attrMap = array('apple-generateduid'=>'appleUID', 'gidNumber'=>'gidNumber', 'cn'=>'cn', 'apple-group-realname'=>'name');// (givenName, sn) = cn
|
|
$attrMap = array('apple-generateduid'=>'appleUID', 'gidNumber'=>'gidNumber', 'cn'=>'cn', 'apple-group-realname'=>'name');// (givenName, sn) = cn
|
|
|
|
|
|
|
|
|
|
+ if (!Config::getConfFile('default_ldap')) {
|
|
|
|
|
+ return array_merge(
|
|
|
|
|
+ array_map(function ($group) {
|
|
|
|
|
+ return (object)[
|
|
|
|
|
+ 'appleUID' => $group->ID, // 'EBE2DE46-1B11-4793-BBAB-A47486B60E6C',
|
|
|
|
|
+ 'gidNumber' => $group->ID, // '1025',
|
|
|
|
|
+ 'cn' => "{$group->ID}_{$group->DESC}", // 'workgroup',
|
|
|
|
|
+ 'name' => "[{$group->ID}] {$group->DESC}", // 'Workgroup',
|
|
|
|
|
+ ];
|
|
|
|
|
+ }, User::getGroups(),
|
|
|
|
|
+ [ (object)[
|
|
|
|
|
+ 'appleUID' => '1025', // 'EBE2DE46-1B11-4793-BBAB-A47486B60E6C',
|
|
|
|
|
+ 'gidNumber' => '1025',
|
|
|
|
|
+ 'cn' => 'workgroup',
|
|
|
|
|
+ 'name' => 'Workgroup',
|
|
|
|
|
+ ] ]
|
|
|
|
|
+ ));
|
|
|
|
|
+ // array (
|
|
|
|
|
+ // 'appleUID' => 'EBE2DE46-1B11-4793-BBAB-A47486B60E6C',
|
|
|
|
|
+ // 'gidNumber' => '1025',
|
|
|
|
|
+ // 'cn' => 'workgroup',
|
|
|
|
|
+ // 'name' => 'Workgroup',
|
|
|
|
|
+ // ),
|
|
|
|
|
+ }
|
|
|
Lib::loadClass('LDAP');
|
|
Lib::loadClass('LDAP');
|
|
|
$ldap = LDAP::getInstance();
|
|
$ldap = LDAP::getInstance();
|
|
|
|
|
|
|
@@ -164,7 +188,7 @@ class UsersLdapHelper {
|
|
|
//$lastLoopFound = array_keys($userLdapGroupsAdd);
|
|
//$lastLoopFound = array_keys($userLdapGroupsAdd);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ DBG::log($userLdapGroups, 'array', '$userLdapGroups');
|
|
|
return $userLdapGroups;
|
|
return $userLdapGroups;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -380,6 +404,9 @@ class UsersLdapHelper {
|
|
|
|
|
|
|
|
Lib::loadClass('LDAP');
|
|
Lib::loadClass('LDAP');
|
|
|
$ldap = LDAP::getInstance();
|
|
$ldap = LDAP::getInstance();
|
|
|
|
|
+ if (!$ldap) {
|
|
|
|
|
+ return []; // TODO: fetch user groups from zasoby
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
$filter = "(&(objectClass=apple-group)(|(cn={$groupID}-*)(cn={$groupID}_*)))";
|
|
$filter = "(&(objectClass=apple-group)(|(cn={$groupID}-*)(cn={$groupID}_*)))";
|
|
|
$attributes = array();
|
|
$attributes = array();
|
|
@@ -436,7 +463,7 @@ class UsersLdapHelper {
|
|
|
return $allLdapGroups;
|
|
return $allLdapGroups;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public static function getGroupsAll($allAttrs = false) {
|
|
|
|
|
|
|
+ public static function getGroupsAll($allAttrs = false) { // used only in TypespecialVariable for field 'DEFAULT_ACL_GROUP'
|
|
|
$allLdapGroups = array();
|
|
$allLdapGroups = array();
|
|
|
|
|
|
|
|
$attrMap = array('apple-generateduid'=>'appleUID', 'gidNumber'=>'gidNumber', 'cn'=>'cn');// (givenName, sn) = cn
|
|
$attrMap = array('apple-generateduid'=>'appleUID', 'gidNumber'=>'gidNumber', 'cn'=>'cn');// (givenName, sn) = cn
|
|
@@ -445,6 +472,9 @@ class UsersLdapHelper {
|
|
|
|
|
|
|
|
Lib::loadClass('LDAP');
|
|
Lib::loadClass('LDAP');
|
|
|
$ldap = LDAP::getInstance();
|
|
$ldap = LDAP::getInstance();
|
|
|
|
|
+ if (!$ldap) {
|
|
|
|
|
+ return []; // TODO: fetch all groups from zasoby
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
$filter = "(objectClass=apple-group)";
|
|
$filter = "(objectClass=apple-group)";
|
|
|
$attributes = array();
|
|
$attributes = array();
|