From d9e62311d9e045c25bc2876a0c963884ed2efaa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Carretero?=
<frederic.carretero@veremes.com>
Date: Mon, 10 Dec 2018 14:55:08 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20dans=20les=20m=C3=A9thodes=20de=20?=
=?UTF-8?q?la=20classe=20"S3=5Ffiles"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vas/rest/class/vmlib/phpUtil.inc | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/vas/rest/class/vmlib/phpUtil.inc b/vas/rest/class/vmlib/phpUtil.inc
index 3d4bcb04..bac8eeaa 100755
--- a/vas/rest/class/vmlib/phpUtil.inc
+++ b/vas/rest/class/vmlib/phpUtil.inc
@@ -131,7 +131,7 @@ function stripslashes_deep($aString) {
//Lance l'upload.
if ($bAllowUpload) {
- if ($properties['fileS3Uploader']){
+ if ($properties['filesystem'] == 's3'){
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
@@ -413,7 +413,7 @@ function stripslashes_deep($aString) {
$sScanDir .= "/" . $sField;
}
- if ($properties['fileS3Uploader']){
+ if ($properties['filesystem'] == 's3'){
return array(getS3FolderInfos($sScanDir));
}else{
return array(getFolderInfos($sScanDir));
@@ -433,7 +433,7 @@ function stripslashes_deep($aString) {
require_once ("aws_sdk/aws-autoloader.php");
$sFilePath = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId . "/" . $sField . "/" . $sFilePath;
- if ($properties['fileS3Uploader']){
+ if ($properties['filesystem'] == 's3'){
// traitement du bucket et de ses sous-dossiers
$sBucket = $properties['fileS3UploaderBucket'];
$sPrefix = "";
@@ -491,7 +491,7 @@ function stripslashes_deep($aString) {
$aFileStruct = extractFileStruct ($sAttrName, $aValues);
- if ($properties['fileS3Uploader']){
+ if ($properties['filesystem'] == 's3'){
// traitement du bucket et de ses sous-dossiers
$sBucket = $properties['fileS3UploaderBucket'];
$sPrefix = "";
@@ -1414,7 +1414,7 @@ function copyFileInWsDataDir ($sModule, $sObject, $mId, $sField = '', $sFileName
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1471,7 +1471,7 @@ function deleteDirectoryInWsDataDir($sModule, $sObject, $mId, $sField = '', $sDi
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1543,7 +1543,7 @@ function getFileContentInWsDataDir($sModule, $sObject, $mId, $sField = '', $sFil
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1611,7 +1611,7 @@ function putFileContentInWsDataDir($sModule, $sObject, $mId = '', $sField = '',
$sDestDir .= "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1682,7 +1682,7 @@ function isDirInWsDataDir($sModule, $sObject, $mId, $sDirectoryName = '') {
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if (!empty($sDirectoryName))
$sDestDir .= '/' . $sDirectoryName;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1743,7 +1743,7 @@ function fileExistsInWsDataDir($sModule, $sObject, $mId = '', $sDirectory = '',
$sDestDir .= "/" . $mId;
if(!empty($sDirectory))
$sDestDir .= "/" . $sDirectory;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -1802,7 +1802,7 @@ function getFileUrlInWsDataDir($sModule, $sObject, $mId, $sField = '', $sFileNam
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
@@ -2010,7 +2010,7 @@ function unzipInWsDataDir($sModule, $sObject, $mId, $sField = '', $sZipFilePath)
$sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
if(!empty($sField))
$sDestDir .= "/" . $sField;
- if ($properties['fileS3Uploader'] === true) {
+ if ($properties['filesystem'] == 's3') {
require_once ("aws_sdk/aws-autoloader.php");
$s3 = new Aws\S3\S3Client(array(
'version'=>'latest',
--
GitLab