Skip to content
Snippets Groups Projects
Commit 097a9704 authored by Frédéric Carretero's avatar Frédéric Carretero
Browse files

Merge remote-tracking branch 'origin/evolution/ws_data_s3' into evolution/ws_data_s3

parents bcd2c91e 7792d00a
No related branches found
No related tags found
No related merge requests found
/vas/
/gtf.engines/
/gtf.messages/
/src/module_gtf/gtf.engine/gtf.engines/php
/src/module_gtf/gtf.engine/gtf.engines/licenses
/client/
/conf/closure
/conf/node_modules/
......
......@@ -10,8 +10,7 @@ class Files_manager{
public $oFileInterface;
private $oProperties;
private $oLocalInterface;
//private $oS3Interface;
public $oLocalInterface;
private static $sFolderLib = "vmlib";
......@@ -208,7 +207,7 @@ class Files_manager{
*@param $sFileTypeCtrl Type of the document. (set to all to disable this control)
*@return $sErrorMsg The error message.
*/
function uploadInWsDataDir ($sModule, $sObject, $mId, $sField, $aValues, $iMaxSize = -1, $sFileTypeCtrl = "all"){
public function uploadInWsDataDir ($sModule, $sObject, $mId, $sField, $aValues, $iMaxSize = -1, $sFileTypeCtrl = "all"){
// on controle les attributs pour éviter les mauvais placements
if (strpos($sModule, '/') > -1){
writeToErrorLog("Module can't contain path : " . $sModule);
......@@ -268,7 +267,7 @@ class Files_manager{
*@param $sFileTypeCtrl Type of the document. (set to all to disable this control)
*@return $sErrorMsg The error message.
*/
function uploadInPublicDir($sModule, $sField, $aValues, $sRandomUniqId = "auto", $iMaxSize = -1, $sFileTypeCtrl = "all"){
public function uploadInPublicDir($sModule, $sField, $aValues, $sRandomUniqId = "auto", $iMaxSize = -1, $sFileTypeCtrl = "all"){
// on controle les attributs pour éviter les mauvais placements
if (strpos($sModule, '/') > -1){
writeToErrorLog("Module can't contain path : " . $sModule);
......@@ -319,7 +318,7 @@ class Files_manager{
*@param $sFileTypeCtrl Type of the document. (set to all to disable this control)
*@return $sErrorMsg The error message.
*/
function uploadInUploadDir($sModule, $sField, $aValues, $sRandomUniqId = "auto", $iMaxSize = -1, $sFileTypeCtrl = "all"){
public function uploadInUploadDir($sModule, $sField, $aValues, $sRandomUniqId = "auto", $iMaxSize = -1, $sFileTypeCtrl = "all"){
// on controle les attributs pour éviter les mauvais placements
if (strpos($sModule, '/') > -1){
writeToErrorLog("Module can't contain path : " . $sModule);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment