aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-06-28 10:54:29 +0200
committerGitHub <noreply@github.com>2019-06-28 10:54:29 +0200
commit2c449469d302c695ee03f6b572e329a005a25651 (patch)
tree866b63aef25ff33d3bd181c153d55d77bc063b27 /settings
parentca76d13c7824367956fcf9ef812432b9c6fc9a2d (diff)
parent20afe94297ca534b9a59cd73dc90d5cb6546ac02 (diff)
downloadnextcloud-server-2c449469d302c695ee03f6b572e329a005a25651.tar.gz
nextcloud-server-2c449469d302c695ee03f6b572e329a005a25651.zip
Merge pull request #16070 from nextcloud/fix/setup-check-no-internet-no-error
Do not show a internet connectivity warning if internet access is dis…
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/CheckSetupController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index f760eefacb6..a8102b2e136 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -123,7 +123,7 @@ class CheckSetupController extends Controller {
* Checks if the server can connect to the internet using HTTPS and HTTP
* @return bool
*/
- private function isInternetConnectionWorking() {
+ private function hasInternetConnectivityProblems(): bool {
if ($this->config->getSystemValue('has_internet_connection', true) === false) {
return false;
}
@@ -134,10 +134,10 @@ class CheckSetupController extends Controller {
foreach($siteArray as $site) {
if ($this->isSiteReachable($site)) {
- return true;
+ return false;
}
}
- return false;
+ return true;
}
/**
@@ -670,7 +670,7 @@ Raw output
'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
'cronInfo' => $this->getLastCronInfo(),
'cronErrors' => $this->getCronErrors(),
- 'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
+ 'serverHasInternetConnectionProblems' => $this->hasInternetConnectivityProblems(),
'isMemcacheConfigured' => $this->isMemcacheConfigured(),
'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
'isRandomnessSecure' => $this->isRandomnessSecure(),