wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added cURL dependency for Amazon S3, Dropbox and SWIFT

Browse source 
Conflicts:
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/swift.php
This commit is contained in:
Philipp Kapfer 2013-06-01 11:28:02 +02:00 committed by Thomas Müller
parent 46379113a1
commit ff9a4a6d91
4 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_external/appinfo/app.php
View file

@ -41,7 +41,8 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
'configuration' => array(
'key' => 'Key',
'secret' => '*Secret',
'bucket' => 'Bucket')));
'bucket' => 'Bucket'),
'has_dependencies' => true));
OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
'backend' => 'Dropbox',
@ -51,7 +52,8 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
'app_secret' => 'App secret',
'token' => '#token',
'token_secret' => '#token_secret'),
'custom' => 'dropbox'));
'custom' => 'dropbox',
'has_dependencies' => true));
OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
'backend' => 'FTP',
@ -79,7 +81,8 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\SWIFT', array(
'user' => 'Username',
'token' => '*Token',
'root' => '&Root',
'secure' => '!Secure ftps://')));
'secure' => '!Secure ftps://'),
'has_dependencies' => true));
OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array(
'backend' => 'SMB / CIFS',

12
apps/files_external/lib/amazons3.php
View file

@ -73,6 +73,18 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
}
/**
* check if curl is installed
*/
public static function checkDependencies() {
if (function_exists('curl_init')) {
return true;
} else {
$l = new \OC_L10N('files_external');
return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of Amazon S3 is not possible. Please ask your system administrator to install it.');
}
}
public function __construct($params) {
if (!isset($params['key']) || !isset($params['secret']) || !isset($params['bucket'])) {
throw new \Exception("Access Key, Secret and Bucket have to be configured.");

12
apps/files_external/lib/dropbox.php
View file

@ -33,6 +33,18 @@ class Dropbox extends \OC\Files\Storage\Common {
private static $tempFiles = array();
/**
* check if curl is installed
*/
public static function checkDependencies() {
if (function_exists('curl_init')) {
return true;
} else {
$l = new \OC_L10N('files_external');
return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of Dropbox is not possible. Please ask your system administrator to install it.');
}
}
public function __construct($params) {
if (isset($params['configured']) && $params['configured'] == 'true'
&& isset($params['app_key'])

12
apps/files_external/lib/swift.php
View file

@ -65,6 +65,18 @@ class Swift extends \OC\Files\Storage\Common {
return $path;
}
/**
* check if curl is installed
*/
public static function checkDependencies() {
if (function_exists('curl_init')) {
return true;
} else {
$l = new \OC_L10N('files_external');
return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of OpenStack Swift is not possible. Please ask your system administrator to install it.');
}
}
/**
* @param string $path
*/