Remove check for aws.phar file in the access.s3 directory. Fix #1257

pydio · Oct 20, 2016 · 98b350f · 98b350f
1 parent bdf5bdc
commit 98b350f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/core/src/plugins/access.s3/S3AccessDriver.php b/core/src/plugins/access.s3/S3AccessDriver.php
@@ -52,7 +52,6 @@ public function performChecks()
     {
         // Check CURL, OPENSSL & AWS LIBRARY
         if(!extension_loaded("curl")) throw new \Exception("Cannot find php_curl extension!");
-        if(!file_exists($this->getBaseDir()."/aws.phar")) throw new \Exception("Cannot find AWS PHP SDK v2. Make sure the aws.phar package is installed inside access.s3 plugin.");
     }
 
     /**

diff --git a/core/src/plugins/access.s3/i18n/conf/de.php b/core/src/plugins/access.s3/i18n/conf/de.php
@@ -20,7 +20,7 @@
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
-"Access an AWS server. Requires AWS-SDK v2 for PHP" => "Auf den AWS-Server zugreifen. Dafür ist ein AWS-SDK-Zugang (Version 2) für PHP nötig",
+"Access an AWS server. Requires AWS-SDK v2 for PHP" => "Auf den Amazon S3 zugreifen.",
 "Key" => "Key",
 "S3 Api Key" => "S3 Api-Key",
 "Secret Key" => "Secret-Key",

diff --git a/core/src/plugins/access.s3/i18n/conf/en.php b/core/src/plugins/access.s3/i18n/conf/en.php
@@ -20,7 +20,7 @@
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
-"Access an AWS server. Requires AWS-SDK v2 for PHP" => "Access an AWS server. Requires AWS-SDK (Version 2) for PHP ",
+"Access an AWS server. Requires AWS-SDK v2 for PHP" => "Store documents in Amazon S3 object storage.",
 "Key" => "Key",
 "S3 Api Key" => "S3 Api Key",
 "Secret Key" => "Secret Key",

diff --git a/core/src/plugins/access.s3/i18n/conf/fr.php b/core/src/plugins/access.s3/i18n/conf/fr.php
@@ -20,7 +20,7 @@
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
-"Access an AWS server. Requires AWS-SDK for PHP" => "Accéder à un serveur AWS. Nécessite AWS-SDK for PHP ",
+"Access an AWS server. Requires AWS-SDK for PHP" => "Stockage des documents dans Amazon S3 (stockage objet).",
 "Key" => "Clé",
 "S3 Api Key" => "Clé d'API S3",
 "Secret Key" => "Clé secrète",

diff --git a/core/src/plugins/access.s3/i18n/conf/it.php b/core/src/plugins/access.s3/i18n/conf/it.php
@@ -20,7 +20,7 @@
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
-"Access an AWS server. Requires AWS-SDK for PHP" => "Accedi ad un server AWS. Richiede l'AWS-SDK per PHP ",
+"Access an AWS server. Requires AWS-SDK for PHP" => "Accedi ad Amazon S3 Object Storage.",
 "Key" => "Chiave",
 "S3 Api Key" => "Chiave API S3",
 "Secret Key" => "Chiave Segreta",

diff --git a/core/src/plugins/access.s3/i18n/conf/pt.php b/core/src/plugins/access.s3/i18n/conf/pt.php
@@ -20,7 +20,7 @@
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Serviço Amazon Web)",
-"Access an AWS server. Requires AWS-SDK for PHP" => "Aceder a um servidor AWS. Requer 'AWS-SDK' para o PHP ",
+"Access an AWS server. Requires AWS-SDK for PHP" => "Aceder a Amazon S3 Object Storage.",
 "Key" => "Chave",
 "S3 Api Key" => "Chave API S3",
 "Secret Key" => "Chave Secreta",