deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move PLA configurable items to config/pla.php
All checks were successful
Create Docker Image / Test Application (x86_64) (push) Successful in 36s
Details
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m22s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 3m30s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George
2025-01-18 21:54:21 +11:00
parent 2445cac6a6
commit d1b4334870
6 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Ldap/Entry.php
View File

@@ -197,7 +197,7 @@ class Entry extends Model
}
}
$sort = collect(config('ldap.attr_display_order',[]))->map(fn($item)=>strtolower($item));
$sort = collect(config('pla.attr_display_order',[]))->map(fn($item)=>strtolower($item));
// Order the attributes
return $result->sortBy([function(Attribute $a,Attribute $b) use ($sort): int {
@@ -215,7 +215,7 @@ class Entry extends Model
if ($b_key === FALSE)
$b_key = $sort->count()+1;
// Case where neither $a, nor $b are in ldap.attr_display_order, $a_key = $b_key = one greater than num elements.
// Case where neither $a, nor $b are in pla.attr_display_order, $a_key = $b_key = one greater than num elements.
// So we sort them alphabetically
if ($a_key === $b_key)
return strcasecmp($a->name,$b->name);

2
app/Ldap/Rules/LoginObjectclassRule.php
View File

@@ -16,7 +16,7 @@ class LoginObjectclassRule implements Rule
{
public function passes(LdapRecord $user, Eloquent $model = null): bool
{
if ($x=config('ldap.login.objectclass')) {
if ($x=config('pla.login.objectclass')) {
return count(array_intersect($user->objectclass,$x));
// Otherwise allow the user to login