Merge pull request #19535 from owncloud/check-memcache-module

[admin] check for correct PHP memcached module

1 files changed, 18 insertions, 0 deletions

diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index ca4eb255f6b..34fe824bc97 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -211,6 +211,23 @@ class CheckSetupController extends Controller {
 	}
 
 	/**
+	 * Checks if the correct memcache module for PHP is installed. Only
+	 * fails if memcached is configured and the working module is not installed.
+	 *
+	 * @return bool
+	 */
+	private function isCorrectMemcachedPHPModuleInstalled() {
+		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+			return true;
+		}
+
+		// there are two different memcached modules for PHP
+		// we only support memcached and not memcache
+		// https://code.google.com/p/memcached/wiki/PHPClientComparison
+		return !extension_loaded('memcached') && extension_loaded('memcache');
+	}
+
+	/**
 	 * @return DataResponse
 	 */
 	public function check() {
@@ -226,6 +243,7 @@ class CheckSetupController extends Controller {
 				'phpSupported' => $this->isPhpSupported(),
 				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
 				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled()
 			]
 		);
 	}