Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vMap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open source
vMap
Commits
097a9704
Commit
097a9704
authored
6 years ago
by
Frédéric Carretero
Browse files
Options
Downloads
Plain Diff
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitignore
+2
-0
2 additions, 0 deletions
.gitignore
src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
+4
-5
4 additions, 5 deletions
src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
with
6 additions
and
5 deletions
.gitignore
+
2
−
0
View file @
097a9704
/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/
...
...
This diff is collapsed.
Click to expand it.
src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
+
4
−
5
View file @
097a9704
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment