Merge pull request #46612 from nextcloud/backport/42892/stable24

[stable24] fix undefined method getExtStorageHome()
nextcloud · Jul 31, 2024 · 0d67331 · 0d67331
2 parents 3270933 + bfacdd3
commit 0d67331
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php b/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php
@@ -62,7 +62,7 @@ public function handle($optionValue) {
 		}
 
 		$ldapUser = $access->userManager->get($user->getUID());
-		$extHome = $ldapUser->getExtStorageHome();
+		$extHome = $ldapUser !== null ? $ldapUser->getExtStorageHome() : '';
 
 		return $this->processInput($optionValue, $extHome);
 	}

diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php
@@ -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 @@ public function getDetectedOn() {
 		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 @@ protected function fetchDetails() {
 			'uid' => 'user_ldap',
 			'homePath' => 'user_ldap',
 			'foundDeleted' => 'user_ldap',
+			'extStorageHome' => 'user_ldap',
 			'email' => 'settings',
 			'lastLogin' => 'login',
 		];