CDPP / AMDA_IHM

Commit a6037a1f8fd6137ae5971e9221e1dfbcbce2de57

Authored by Benjamin Renard
1 parent 6743dfac
Exists in master and in 63 other branches 10098, 10178, 5390, 7616, 9014, 9016Bis, 9084, 9326, 9505, 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, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam, test-merge

Fix bug during AMDA_IHM installation without proxy

Showing 1 changed file with 6 additions and 2 deletions   Show diff stats
Inline Side-by-side
php/my_config.template.php
  Diff comments   View file @a6037a1
... ... @@ -28,8 +28,12 @@ define('MAX_UPLOADED_FILESIZE',{:MAX_UPLOADED_FILESIZE:}); // in bytes !!!
28 28 define('GATEWAY_TIMEOUT','{:GATEWAY_TIMEOUT:}');
29 29  
30 30 // To define only if you are behind a proxy
31   -define('PROXY_HOST','{:PROXY_HOST:}');
32   -define('PROXY_USERPWD','{:PROXY_USERPWD:}');
  31 +if (!empty("{:PROXY_HOST:}")) {
  32 + define('PROXY_HOST','{:PROXY_HOST:}');
  33 + if (!empty("{:PROXY_USERPWD:}")) {
  34 + define('PROXY_USERPWD','{:PROXY_USERPWD:}');
  35 + }
  36 +}
33 37  
34 38 define('NEWMETA', '{:NEWMETA:}');
35 39 define('AMDA_SPASE_INTERFACE', '{:AMDA_SPASE_INTERFACE:}');
... ...