summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/js/setupchecks.js5
-rw-r--r--lib/private/util.php1
-rw-r--r--settings/ajax/checksetup.php3
3 files changed, 7 insertions, 2 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index db5365c124d..d43a356999c 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -59,6 +59,11 @@
t('core', 'Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')
);
}
+ if(!data.hasCurlInstalled) {
+ messages.push(
+ t('core', 'cURL is not installed, some functionality might not work. Please install the PHP cURL extension. Future versions will require installed cURL.')
+ );
+ }
} else {
messages.push(t('core', 'Error occurred while checking server setup'));
}
diff --git a/lib/private/util.php b/lib/private/util.php
index f1636486660..9454d9f9226 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -587,7 +587,6 @@ class OC_Util {
'iconv' => 'iconv',
'simplexml_load_string' => 'SimpleXML',
'hash' => 'HASH Message Digest Framework',
- 'curl_init' => 'cURL',
],
'defined' => array(
'PDO::ATTR_DRIVER_NAME' => 'PDO'
diff --git a/settings/ajax/checksetup.php b/settings/ajax/checksetup.php
index 64718933317..3e226c5aa38 100644
--- a/settings/ajax/checksetup.php
+++ b/settings/ajax/checksetup.php
@@ -19,6 +19,7 @@ if (OC_Util::isInternetConnectionEnabled()) {
OCP\JSON::success(
array (
'serverHasInternetConnection' => $hasInternet,
- 'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
+ 'dataDirectoryProtected' => OC_Util::isHtaccessWorking(),
+ 'hasCurlInstalled' => function_exists('curl_init'),
)
);