D5322.1775245873.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5322.1775245873.diff
View Options

	diff --git a/src/app/Backends/DAV.php b/src/app/Backends/DAV.php
	--- a/src/app/Backends/DAV.php
	+++ b/src/app/Backends/DAV.php
	@@ -184,10 +184,10 @@
	*
	* @return bool True on success, False otherwise
	*/
	- public static function healthcheck(): bool
	+ public static function healthcheck($user, $password): bool
	{
	- // TODO
	- return true;
	+ $homes = self::getInstance($user, $password)->discover();
	+ return !empty($homes);
	}

	/**
	diff --git a/src/app/Console/Commands/Status/Health.php b/src/app/Console/Commands/Status/Health.php
	--- a/src/app/Console/Commands/Status/Health.php
	+++ b/src/app/Console/Commands/Status/Health.php
	@@ -73,7 +73,7 @@
	private function checkDAV()
	{
	try {
	- return DAV::healthcheck();
	+ return DAV::healthcheck($this->option('user'), $this->option('password'));
	} catch (\Exception $exception) {
	$this->line($exception);
	return false;
	@@ -196,11 +196,11 @@
	$steps = $this->option('check');
	if (empty($steps)) {
	$steps = [
	- 'DB', 'Redis', 'Roundcube', 'Meet', 'DAV', 'Mollie', 'OpenExchangeRates',
	+ 'DB', 'Redis', 'Roundcube', 'Meet', 'Mollie', 'OpenExchangeRates',
	];
	if (!empty($this->option('user'))) {
	array_unshift($steps, 'Auth');
	- array_unshift($steps, 'SMTP');
	+ array_unshift($steps, 'DAV');
	}
	if (\config('app.with_ldap')) {
	array_unshift($steps, 'LDAP');