CDPP / AMDA_IHM

Commit 585c86b466569392f6c4f450654847dea4cbbb92

Authored by Benjamin Renard
1 parent 57f8eda0
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Minor fixes in upload script

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/uploadFile.php
  Diff comments   View file @585c86b
@@ -81,6 +81,7 @@ @@ -81,6 +81,7 @@
81 } 81 }
82 82
83 define('USERDATADIR', USERPATH."/".$_POST['sessionID']."/DATA/"); 83 define('USERDATADIR', USERPATH."/".$_POST['sessionID']."/DATA/");
  84 + define('USERTTDIR', USERPATH."/".$_POST['sessionID']."/TT/");
84 define('USERTEMPDIR', USERPATH."/".$_POST['sessionID']."/TEMP/"); 85 define('USERTEMPDIR', USERPATH."/".$_POST['sessionID']."/TEMP/");
85 define('USERWSDIR', USERPATH."/".$_POST['sessionID']."/WS/"); 86 define('USERWSDIR', USERPATH."/".$_POST['sessionID']."/WS/");
86 define('USERWORKINGDIR', USERPATH."/".$_POST['sessionID']."/RES/"); 87 define('USERWORKINGDIR', USERPATH."/".$_POST['sessionID']."/RES/");
@@ -96,8 +97,8 @@ @@ -96,8 +97,8 @@
96 if (!is_dir(USERTEMPDIR)) mkdir(USERTEMPDIR.'/', 0755, true); 97 if (!is_dir(USERTEMPDIR)) mkdir(USERTEMPDIR.'/', 0755, true);
97 if (!is_dir(ATTACHMENTDIR)) mkdir(ATTACHMENTDIR.'/', 0755, true); 98 if (!is_dir(ATTACHMENTDIR)) mkdir(ATTACHMENTDIR.'/', 0755, true);
98 99
99 - if (!$_FILES['attachment'] && !$_FILES['localFileName'] && !$_FILES['localTTName'] && !$_FILES['localCatName'] &&  
100 - !$_POST['remoteFile'] && !$_POST['remoteTT'] && !$_POST['remoteCat']) 100 + if (!isset($_FILES['attachment']) && !isset($_FILES['localFileName']) && !isset($_FILES['localTTName']) && !isset($_FILES['localCatName']) &&
  101 + !isset($_POST['remoteFile']) && !isset($_POST['remoteTT']) && !isset($_POST['remoteCat']))
101 { 102 {
102 $response = array( 'success' => false, 'error' => 'UNDEFINED ACTION'); 103 $response = array( 'success' => false, 'error' => 'UNDEFINED ACTION');
103 die(json_encode($response)); 104 die(json_encode($response));
@@ -108,7 +109,7 @@ @@ -108,7 +109,7 @@
108 $timeSmplg = $_POST['timesmpl'] ? $_POST['timesmpl'] : null; 109 $timeSmplg = $_POST['timesmpl'] ? $_POST['timesmpl'] : null;
109 $nonStd = $_POST['nonstd'] ? $_POST['nonstd'] : null; 110 $nonStd = $_POST['nonstd'] ? $_POST['nonstd'] : null;
110 $timeLength = $_POST['timelength'] ? $_POST['timelength'] : null; 111 $timeLength = $_POST['timelength'] ? $_POST['timelength'] : null;
111 - $doy = $_POST['doy'] ? $_POST['doy'] : null; 112 + $doy = isset($_POST['doy']) ? $_POST['doy'] : null;
112 113
113 $allFormats = array('fileFormat' => $fileFrmt, 'timeFormat' => $timeFrmt, 'doy' => $doy, 114 $allFormats = array('fileFormat' => $fileFrmt, 'timeFormat' => $timeFrmt, 'doy' => $doy,
114 'timeSampling' => $timeSmplg, 'nonStandard' => $nonStd, 'timeLength' => $timeLength); 115 'timeSampling' => $timeSmplg, 'nonStandard' => $nonStd, 'timeLength' => $timeLength);