CDPP / AMDA_IHM

Commit 5f8bd1f510e220c8a3e3f78b8cef8a3cf08f990e

Authored by Nathanaël Jourdane
1 parent 34d41fb3
Exists in master and in 109 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, 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

Fix Windows-files import problem

Showing 1 changed file with 3 additions and 0 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @5f8bd1f
... ... @@ -594,6 +594,9 @@ class AmdaAction
594 594 */
595 595 public function getUploadedObject($name, $format, $nodeType)
596 596 {
  597 + $fileContent = preg_replace(['~\R~u', "/\t/"], ["\n", ' '], trim(file_get_contents(USERTEMPDIR . $name)));
  598 + file_put_contents(USERTEMPDIR . $name, $fileContent);
  599 +
597 600 switch ($nodeType)
598 601 {
599 602 case 'timeTable' :
... ...