@@ -257,20 +257,20 @@ public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook,
257
257
return $ out ;
258
258
}
259
259
260
- public function getAllUsersArrays ($ attributes = [])
260
+ public function getAllUsersAttributes ($ attributes = [])
261
261
{
262
- $ include_uids = $ this ->getAllUsersUIDs ();
263
- $ user_arrays = $ this ->baseOU ->getChildrenArray (
262
+ $ include_uids = $ this ->getAllUsersAttributes ();
263
+ $ user_attributes = $ this ->baseOU ->getChildrenArray (
264
264
$ attributes ,
265
265
true , // recursive
266
266
"objectClass=posixAccount "
267
267
);
268
- foreach ($ user_arrays as $ i => $ array ) {
269
- if (!in_array ($ array ["uid " ][0 ], $ include_uids )) {
270
- unset($ user_arrays [$ i ]);
268
+ foreach ($ user_attributes as $ i => $ attributes ) {
269
+ if (!in_array ($ attributes ["uid " ][0 ], $ include_uids )) {
270
+ unset($ user_attributes [$ i ]);
271
271
}
272
272
}
273
- return $ user_arrays ;
273
+ return $ user_attributes ;
274
274
}
275
275
276
276
public function getAllPIGroups ($ UnitySQL , $ UnityMailer , $ UnityRedis , $ UnityWebhook , $ ignorecache = false )
@@ -305,9 +305,9 @@ public function getAllPIGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebho
305
305
return $ out ;
306
306
}
307
307
308
- public function getAllPIGroupsArrays ( )
308
+ public function getAllPIGroupsAttributes ( $ attributes = [] )
309
309
{
310
- return $ this ->pi_groupOU ->getChildrenArray ([], true );
310
+ return $ this ->pi_groupOU ->getChildrenArray ($ attributes );
311
311
}
312
312
313
313
public function getPIGroupGIDsWithMemberUID ($ uid )
@@ -322,7 +322,7 @@ public function getPIGroupGIDsWithMemberUID($uid)
322
322
);
323
323
}
324
324
325
- public function getAllPIGroupOwnerArrays ($ attributes = [])
325
+ public function getAllPIGroupOwnerAttributes ($ attributes = [])
326
326
{
327
327
// get the PI groups, filter for just the GIDs, then map the GIDs to owner UIDs
328
328
$ owner_uids = array_map (
@@ -332,13 +332,13 @@ public function getAllPIGroupOwnerArrays($attributes = [])
332
332
$ this ->pi_groupOU ->getChildrenArray (["cn " ]),
333
333
),
334
334
);
335
- $ owner_arrays = $ this ->getAllUsersArrays ($ attributes );
336
- foreach ($ owner_arrays as $ i => $ array ) {
337
- if (!in_array ($ array ["uid " ][0 ], $ owner_uids )) {
338
- unset($ owner_arrays [$ i ]);
335
+ $ owner_attributes = $ this ->getAllUsersAttributes ($ attributes );
336
+ foreach ($ owner_attributes as $ i => $ attributes ) {
337
+ if (!in_array ($ attributes ["uid " ][0 ], $ owner_uids )) {
338
+ unset($ owner_attributes [$ i ]);
339
339
}
340
340
}
341
- return $ owner_arrays ;
341
+ return $ owner_attributes ;
342
342
}
343
343
344
344
/** Returns an assosiative array where keys are UIDs and values are arrays of PI GIDs */
@@ -348,7 +348,7 @@ public function getAllUID2PIGIDs()
348
348
$ uids = $ this ->getAllUsersUIDs ();
349
349
$ uid2pigids = array_combine ($ uids , array_fill (0 , count ($ uids ), []));
350
350
// for each PI group, append that GID to the member list for each of its member UIDs
351
- foreach ($ this ->getAllPIGroupsArrays ( ) as $ array ) {
351
+ foreach ($ this ->getAllPIGroupsAttributes ([ " cn " , " memberuid " ] ) as $ array ) {
352
352
$ gid = $ array ["cn " ][0 ];
353
353
foreach ($ array ["memberuid " ] as $ uid ) {
354
354
array_push ($ uid2pigids [$ uid ], $ gid );
@@ -388,9 +388,9 @@ public function getAllOrgGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebh
388
388
return $ out ;
389
389
}
390
390
391
- public function getAllOrgGroupsArrays ( )
391
+ public function getAllOrgGroupsAttributes ( $ attributes = [] )
392
392
{
393
- return $ this ->org_groupOU ->getChildrenArray ([] , true );
393
+ return $ this ->org_groupOU ->getChildrenArray ($ attributes , true );
394
394
}
395
395
396
396
public function getUserEntry ($ uid )
0 commit comments