[Pkg-owncloud-commits] [owncloud] 80/118: Remove hard dependency on cURL for 8.0

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit e2ea175ea2ba965d676a6c9867b6657f47bfba8d
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Mar 23 15:19:46 2015 +0100

    Remove hard dependency on cURL for 8.0
    
    This removes the recently introduced hard dependency on cURL for 8.0, for 8.1 it will still stay there.
    
    Instead a warning will now be shown to the user asking to install the PHP cURL extension within the administrative interface of ownCloud.
---
 core/js/setupchecks.js       | 5 +++++
 lib/private/util.php         | 1 -
 settings/ajax/checksetup.php | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index db5365c..d43a356 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 f163648..9454d9f 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 6471893..3e226c5 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'),
 	)
 );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git