upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #37346 from nextcloud/fix/34557/undefined-getExtStorageHome

Browse source 
fix undefined method getExtStorageHome()
This commit is contained in:
Arthur Schiwon 2023-03-27 15:33:57 +02:00 committed by GitHub
commit 0be7548e22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php
View file

@ -62,7 +62,7 @@ class ExtStorageConfigHandler extends UserContext implements IConfigHandler {
}
$ldapUser = $access->userManager->get($user->getUID());
$extHome = $ldapUser->getExtStorageHome();
$extHome = $ldapUser !== null ? $ldapUser->getExtStorageHome() : '';
return $this->processInput($optionValue, $extHome);
}

9
apps/user_ldap/lib/User/OfflineUser.php
View file

@ -60,6 +60,7 @@ class OfflineUser {
* @var string $foundDeleted the timestamp when the user was detected as unavailable
*/
protected $foundDeleted;
protected ?string $extStorageHome = null;
/**
* @var string $email
*/
@ -207,6 +208,13 @@ class OfflineUser {
return (int)$this->foundDeleted;
}
public function getExtStorageHome(): string {
if ($this->extStorageHome === null) {
$this->fetchDetails();
}
return (string)$this->extStorageHome;
}
/**
* getter for having active shares
* @return bool
@ -227,6 +235,7 @@ class OfflineUser {
'uid' => 'user_ldap',
'homePath' => 'user_ldap',
'foundDeleted' => 'user_ldap',
'extStorageHome' => 'user_ldap',
'email' => 'settings',
'lastLogin' => 'login',
];