improve overwrite cli url setup check

Signed-off-by: szaimen <szaimen@e.mail.de>

Author: szaimen

apps/settings/lib/Controller/CheckSetupController.php

@@ -609,15 +609,25 @@ protected function hasWorkingFileLocking(): bool {
 	}
 
 	protected function getSuggestedOverwriteCliURL(): string {
-		$suggestedOverwriteCliUrl = '';
-		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+		$currentOverwriteCliUrl = $this->config->getSystemValue('overwrite.cli.url', '');
+		$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+
+		// Set if not set yet
+		if ($currentOverwriteCliUrl === '') {
 			if (!$this->config->getSystemValue('config_is_read_only', false)) {
 				// Set the overwrite URL when it was not set yet.
 				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
-				$suggestedOverwriteCliUrl = '';
+				$currentOverwriteCliUrl = $suggestedOverwriteCliUrl;
 			}
 		}
+
+		// Check correctness by comparing with suggested URL
+		// This might lead to false positives though but that is fine since you should access your Nextcloud via the here defined URL either way
+		// In case of a false positive, simply ignore the suggestion
+		if ($suggestedOverwriteCliUrl === rtrim($currentOverwriteCliUrl, "/")) {
+			$suggestedOverwriteCliUrl = '';
+		}
+
 		return $suggestedOverwriteCliUrl;
 	}
 

core/js/setupchecks.js

@@ -225,7 +225,7 @@
 					}
 					if (data.suggestedOverwriteCliURL !== '') {
 						messages.push({
-							msg: t('core', 'If your installation is not installed at the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (suggestion: "{suggestedOverwriteCliURL}")', {suggestedOverwriteCliURL: data.suggestedOverwriteCliURL}),
+							msg: t('core', 'Please make sure to set the "overwrite.cli.url" option in your config.php file to the URL that your users mainly use to access this Nextcloud. Suggestion: "{suggestedOverwriteCliURL}". Otherwise there might be problems with the URL generation via cron. (It is possible though that the suggested URL is not the URL that your users mainly use to access this Nextcloud and you have already configured the correct URL. In that case, just ignore this suggestion. Best is to double check this in any case.)', {suggestedOverwriteCliURL: data.suggestedOverwriteCliURL}),
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						});
 					}