YunoHost-Apps/dotclear2_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dotclear2_ynh.git synced 2024-09-03 18:26:29 +02:00
Code Issues Activity Actions 1

fix ldapDcAuth class to be compatible with dcAuth

Browse source
This commit is contained in:
Kay0u 2023-02-02 13:10:00 +01:00
parent b1ce0993a6
commit e9e48468fa
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/class.auth.ldap.php
View file

@ -9,7 +9,7 @@ class ldapDcAuth extends dcAuth
private $port = "389"; private $port = "389";
private $base = "dc=yunohost,dc=org"; private $base = "dc=yunohost,dc=org";
public function checkUser($user_id, $pwd=null, $user_key=null, $check_blog=true) public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_key = NULL, bool $check_blog = true): bool
{ {
if ($pwd == '') { if ($pwd == '') {
return parent::checkUser($user_id, null, $user_key, $check_blog); return parent::checkUser($user_id, null, $user_key, $check_blog);
@ -56,9 +56,9 @@ class ldapDcAuth extends dcAuth
} }
# If the user exist, then we just update his password. # If the user exist, then we just update his password.
if ($this->core->userExists($user_id)) if (dcCore::app()->userExists($user_id))
{ {
$this->sudo(array($this->core, 'updUser'), $user_id, $cur); $this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur);
} }
# If not, we create him. # If not, we create him.
# In order for him to connect, # In order for him to connect,
@ -69,7 +69,7 @@ class ldapDcAuth extends dcAuth
$cur->user_lang = 'fr'; # Can change this, PR are welcome $cur->user_lang = 'fr'; # Can change this, PR are welcome
$cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome $cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome
$cur->user_default_blog = 'default'; # Can change this, PR are welcome $cur->user_default_blog = 'default'; # Can change this, PR are welcome
$this->sudo(array($this->core,'addUser'), $cur); $this->sudo(array(dcCore::app(),'addUser'), $cur);
# Possible roles: # Possible roles:
# admin "administrator" # admin "administrator"
# contentadmin "manage all entries and comments" # contentadmin "manage all entries and comments"
@ -100,7 +100,7 @@ class ldapDcAuth extends dcAuth
$set_perms[$perm_id] = true; $set_perms[$perm_id] = true;
} }
} }
$this->sudo(array($this->core, 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true); $this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
} }
$this->con->commit(); $this->con->commit();