Merge pull request #3092 from guruz/external_storage_check_for_curl

External Storage: Check for curl in PHP
This commit is contained in:
Frank Karlitschek 2013-04-23 09:48:04 -07:00
commit 99cb37a6d1

View File

@ -70,7 +70,7 @@ class OC_Mount_Config {
'root' => '&Root',
'secure' => '!Secure ftps://'));
$backends['\OC\Files\Storage\Google']=array(
if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\Google']=array(
'backend' => 'Google Drive',
'configuration' => array(
'configured' => '#configured',
@ -96,7 +96,7 @@ class OC_Mount_Config {
'share' => 'Share',
'root' => '&Root'));
$backends['\OC\Files\Storage\DAV']=array(
if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\DAV']=array(
'backend' => 'ownCloud / WebDAV',
'configuration' => array(
'host' => 'URL',
@ -414,6 +414,13 @@ class OC_Mount_Config {
}
}
/**
* check if curl is installed
*/
public static function checkcurl() {
return (function_exists('curl_init'));
}
/**
* check dependencies
*/
@ -426,6 +433,9 @@ class OC_Mount_Config {
if(!OC_Mount_Config::checkphpftp()) {
$txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
}
if(!OC_Mount_Config::checkcurl()) {
$txt.=$l->t('<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.').'<br />';
}
return($txt);
}