CDPP / AMDA_IHM

Commit 23a99466dc15b7a956aba444e107e6a1c560de98

Authored by Benjamin Renard
1 parent d6d40c1d
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 proxy host definition

Showing 2 changed files with 16 additions and 11 deletions   Show diff stats
Inline Side-by-side
php/classes/ProxyUtils.php
  Diff comments   View file @23a9946
... ... @@ -2,16 +2,19 @@
2 2  
3 3 class ProxyUtils {
4 4 static function addProxyForCurl(&$ch) {
5   - if (defined('PROXY_HOST')) {
6   - curl_setopt($ch, CURLOPT_PROXY, "http://".PROXY_HOST);
7   - if (defined('PROXY_USERPWD')) {
8   - curl_setopt($ch, CURLOPT_PROXYUSERPWD, PROXY_USERPWD);
  5 + $proxy_host = PROXY_HOST;
  6 + if (!empty($proxy_host)) {
  7 + curl_setopt($ch, CURLOPT_PROXY, "http://".$proxy_host);
  8 + $proxy_userpwd = PROXY_USERPWD;
  9 + if (!empty($proxy_userpwd)) {
  10 + curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxy_userpwd);
9 11 }
10 12 }
11 13 }
12 14  
13 15 static function getStreamContextWithProxy() {
14   - if (!defined('PROXY_HOST'))
  16 + $proxy_host = PROXY_HOST;
  17 + if (empty($proxy_host))
15 18 return;
16 19 $options = array(
17 20 'http' => array(
... ... @@ -21,10 +24,11 @@ class ProxyUtils {
21 24 'ignore_errors' => true,
22 25 )
23 26 );
24   - $options['http']['proxy'] = 'tcp://'.PROXY_HOST;
  27 + $options['http']['proxy'] = 'tcp://'.$proxy_host;
25 28 $options['http']['request_fulluri'] = TRUE;
26   - if (defined('PROXY_USERPWD')) {
27   - $options['http']['header'] = "Proxy-Authorization: Basic ".base64_encode(PROXY_USERPWD);
  29 + $proxy_userpwd = PROXY_USERPWD;
  30 + if (!empty($proxy_userpwd)) {
  31 + $options['http']['header'] = "Proxy-Authorization: Basic ".base64_encode($proxy_userpwd);
28 32 }
29 33 return stream_context_create($options);
30 34 }
... ...
php/epntap.php
  Diff comments   View file @23a9946
... ... @@ -64,13 +64,14 @@ function resolver() {
64 64 }
65 65  
66 66 function request($access_url, $query) {
67   - error_log($query);
  67 +# error_log($query);
68 68 $votMgr = new VOTableMgr;
69 69 $params = 'FORMAT=votable&LANG=ADQL&REQUEST=doQuery';
70 70 $url = $access_url . '/sync?' . $params . '&QUERY=' . urlencode(preg_replace('/\s+/', ' ', $query)); // remove also multiple whitespaces
71 71  
72   - $votMgr->load($url);
73   - $data = $votMgr->parseStream();
  72 + if ($votMgr->load($url)) {
  73 + $data = $votMgr->parseStream();
  74 + }
74 75 $error = $votMgr->getVotableError();
75 76  
76 77 $response = ['query' => $query, 'metaData' => ['root' => 'data', 'messageProperty' => 'msg']];
... ...