From a394ee090eb529ac10cbf588fd0fd8f980397820 Mon Sep 17 00:00:00 2001
From: Nathanael Jourdane <nathanael.jourdane@irap.omp.eu>
Date: Wed, 22 Nov 2017 10:30:34 +0100
Subject: [PATCH] bugFix token

---
 php/config.php              | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------
 php/my_config.php           |  10 +++++-----
 php/rest/getDatasetData.php |  19 +++++++++----------
 php/rest/getOrbites.php     |  13 ++++++-------
 php/rest/getParameter.php   |  13 ++++++-------
 5 files changed, 153 insertions(+), 157 deletions(-)

diff --git a/php/config.php b/php/config.php
index 3cd931a..740a837 100644
--- a/php/config.php
+++ b/php/config.php
@@ -1,5 +1,5 @@
 <?php
- /**
+/**
  * @file config.php
  * @version $Id: config.php 2368 2014-05-21 08:46:23Z elena $
  *
@@ -21,21 +21,23 @@
 */
 require_once 'my_config.php';
 
-if (is_file('amda_version.php'))
-	require_once 'amda_version.php';
+if (is_file('amda_version.php')) {
+    require_once 'amda_version.php';
+}
 
-if (is_file('errors.php'))
-	require_once 'errors.php';
+if (is_file('errors.php')) {
+    require_once 'errors.php';
+}
 
 /*----------------------- SYSTEM config section --------*/
-if (!defined('PHP_VERSION_ID'))
-{
-	$version = explode('.', PHP_VERSION);
-	define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
+if (!defined('PHP_VERSION_ID')) {
+    $version = explode('.', PHP_VERSION);
+    define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
 }
 
-if (!defined('MAGIC_FILE'))
-	define('MAGIC_FILE','/usr/share/misc/magic');
+if (!defined('MAGIC_FILE')) {
+    define('MAGIC_FILE', '/usr/share/misc/magic');
+}
 
 date_default_timezone_set('UTC');
 /*-----------------------END SYSTEM config section --------*/
@@ -47,11 +49,11 @@ define("MaxGuestTimeInterval", 10);   // days
 /*-----------------------END GUESTS LOGIN section --------*/
 
 // user WS size limit
-define('DISK_QUOTA', 1024*1024*200); // 200MB
+define('DISK_QUOTA', 1024 * 1024 * 200); // 200MB
 // max lines of uploaded ascii file to show
 define('MAX_FILE_INDEX_TO_SHOW', 100);
 // private key used to be considerate as a trust client for some functions of DD web service
-define('DDSERVICE_PRIVATEKEY','!%p856Dc');
+define('DDSERVICE_PRIVATEKEY', '!%p856Dc');
 
 define('IMPEX_INTERVAL_LIMIT', 86400); // one day for impex request
 
@@ -64,12 +66,12 @@ define('JOB_CYCLES_NUMBER', 5);   // cycles number for all the jobs
 /*-----------------------END BATCH JOBS section --------*/
 
 // EPN-TAP services
-define('EPNTAP_APIS','http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
-define('EPNTAP_AMDA','http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
+define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
+define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
 
 /*----------------------- PHP run-time settings --------*/
-ini_set('memory_limit',128000000);
-ini_set('max_execution_time',600); // max PHP execution
+ini_set('memory_limit', 128000000);
+ini_set('max_execution_time', 600); // max PHP execution
 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES
 // to avoid 403 error while copying from URL
 ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201001012 Firefox/7.0');
@@ -79,145 +81,142 @@ ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201
 /*-----------------------END PHP run-time settings --------*/
 
 // General Info dirs
-define('DATAPATH', IHM_SRC_DIR.'generic_data/');
+define('DATAPATH', IHM_SRC_DIR . 'generic_data/');
 //define('Param', DATAPATH.'Param/');
-define('LocalData', DATAPATH.'LocalData/');
-define('RemoteData', DATAPATH.'RemoteData/');
-define('Functions', DATAPATH.'Functions/');
+define('LocalData', DATAPATH . 'LocalData/');
+define('RemoteData', DATAPATH . 'RemoteData/');
+define('Functions', DATAPATH . 'Functions/');
 //define('Plot', DATAPATH.'Plot/');
-define('Hst', DATAPATH.'Hst/');
-define('SpecialSettingsDir',DATAPATH.'SpecialSettings/');
+define('Hst', DATAPATH . 'Hst/');
+define('SpecialSettingsDir', DATAPATH . 'SpecialSettings/');
 
 // General Info files
-define('orbitsXml',LocalData.'Orbites.xml');
-define('orbitsAllXml',LocalData.'OrbitsAll.xml');
-define('FeedbackXml', DATAPATH.'Feedback/Feedback.xml');
-define('specialGrpsXml',SpecialSettingsDir.'Groups.xml');
-define('specialSettingsXml',SpecialSettingsDir.'Settings.xml');
+define('orbitsXml', LocalData . 'Orbites.xml');
+define('orbitsAllXml', LocalData . 'OrbitsAll.xml');
+define('FeedbackXml', DATAPATH . 'Feedback/Feedback.xml');
+define('specialGrpsXml', SpecialSettingsDir . 'Groups.xml');
+define('specialSettingsXml', SpecialSettingsDir . 'Settings.xml');
 
 //Help info dirs
-define('HELPPATH',  IHM_SRC_DIR."help/");
+define('HELPPATH', IHM_SRC_DIR . "help/");
 
 // IMPEX special files
-define('SimuTargetsXml', DATAPATH.'SimuTemplate/TargetsSimu.xml');
+define('SimuTargetsXml', DATAPATH . 'SimuTemplate/TargetsSimu.xml');
 
 // Root User dir  : All user dirs are defined in UserMgr.php
-define('USERPATH', IHM_SRC_DIR.'data/');
+define('USERPATH', IHM_SRC_DIR . 'data/');
 
 // Shared dir
-define('SHAREDPATH', IHM_SRC_DIR.'shared_data/');
+define('SHAREDPATH', IHM_SRC_DIR . 'shared_data/');
 
 /*------------------- WEB SERVICES section ---------*/
-define('WSRESULT', USERPATH.'WSRESULT/'); // Web Services result directory
-define('wsResultsXml',WSRESULT.'WSresults.xml'); // Web Service result file
+define('WSRESULT', USERPATH . 'WSRESULT/'); // Web Services result directory
+define('wsResultsXml', WSRESULT . 'WSresults.xml'); // Web Service result file
 
-define('plotsXml', IHM_SRC_DIR.'public/WebServices/XML/AmdaPlots.xml'); // Web Service getPlot : list of parameters to plot
+define('plotsXml', IHM_SRC_DIR . 'public/WebServices/XML/AmdaPlots.xml'); // Web Service getPlot : list of parameters to plot
 
 // Web Service servers WSDL : $_SERVER['SERVER_NAME'] (par apache)  gethostname() (par command)
-$SERVER_NAME =  $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname();
+$SERVER_NAME = $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname();
 
-define('webAlias',"http://".$SERVER_NAME.APACHE_ALIAS);
-define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl");
+define('webAlias', "http://" . $SERVER_NAME . APACHE_ALIAS);
+define('wsdl_AMDA', webAlias . "public/wsdl/Methods_AMDA.wsdl");
 
 // Time interval between 2 queries before to ask for a new authentification, in seconds.
-define ('timeLimitQuery', 600);
+define('timeLimitQuery', 600); // 10 minutes
+
 /*-------------------END WEB SERVICES section ---------*/
 
 // AKKA - KERNELBIN is now the new kernel bin dir
-define('KERNELBIN',NEWKERNEL_INSTALL_DIR.'bin/');
+define('KERNELBIN', NEWKERNEL_INSTALL_DIR . 'bin/');
 
-putenv("LD_LIBRARY_PATH=".SYS_LIBS.":".DDLIB.":".CEFLIB.":".CDFLIB);
-putenv("PATH=./:".DDBIN.":".SYS_BIN.":".IHM_SRC_DIR."php/bin");
+putenv("LD_LIBRARY_PATH=" . SYS_LIBS . ":" . DDLIB . ":" . CEFLIB . ":" . CDFLIB);
+putenv("PATH=./:" . DDBIN . ":" . SYS_BIN . ":" . IHM_SRC_DIR . "php/bin");
 
-putenv("DDPATH=".DDRES_DIR);
+putenv("DDPATH=" . DDRES_DIR);
 
 // PHP classes
-define('XMLPATH', IHM_SRC_DIR.'php/XML/');
-define('CLASSPATH', IHM_SRC_DIR.'php/classes/');
-define('REMOTE_CLASSPATH', IHM_SRC_DIR.'php/RemoteDataCenter/');
-define('OLD_CLASSPATH', IHM_SRC_DIR.'php/old_amda/');
-
-set_include_path(".:".CLASSPATH.":".REMOTE_CLASSPATH.":".OLD_CLASSPATH);
-
-if (!function_exists('__autoload'))
-{
-	function __autoload($class_name) {
-			require_once $class_name . '.php';
-	}
+define('XMLPATH', IHM_SRC_DIR . 'php/XML/');
+define('CLASSPATH', IHM_SRC_DIR . 'php/classes/');
+define('REMOTE_CLASSPATH', IHM_SRC_DIR . 'php/RemoteDataCenter/');
+define('OLD_CLASSPATH', IHM_SRC_DIR . 'php/old_amda/');
+
+set_include_path(".:" . CLASSPATH . ":" . REMOTE_CLASSPATH . ":" . OLD_CLASSPATH);
+
+if (!function_exists('__autoload')) {
+    function __autoload($class_name)
+    {
+        require_once $class_name . '.php';
+    }
 }
 
 global $API;
-$API = array(
-	'AmdaAction'=>array(
-		'methods'=>array(
-			'getTree'=>array('len'=>1),
-			'saveTree'=>array('len'=>1),
-			'getInfo'=>array('len'=>1),
-			'doNothing'=>array('len'=>1),
-			'deleteFromTree'=>array('len'=>1),
-			'getObject'=>array('len'=>2),
-			'getAsciiFile'=>array('len'=>1),
-			'getTmpObject'=>array('len'=>3),
-			'getUploadedObject'=>array('len'=>3),
-			'getMyParamInfo'=>array('len'=>1),
-			'deleteObject'=>array('len'=>1),
-			'renameObject'=>array('len'=>1),
-			'createObject'=>array('len'=>2),
-			'modifyObject'=>array('len'=>1),
-			'validNameObject'=>array('len'=>1),
-			'getJobs'=>array('len'=>0),
-			'execute'=>array('len'=>2),
-			//'formHandler'=>true
-			'compilParam'=>array('len'=>1),
-			'compilParamDelete'=>array('len'=>1),
-			'killPlotRequest'=>array('len'=>0),
-			'merge'=>array('len'=>1),
-			'intersect'=>array('len'=>1),
-			'loadTTIntervals'=>array('len'=>1),
-			'saveTTCacheIntervalsInTT'=>array('len'=>1),
-			'initTTCache'=>array ('len'=>2),
-			'initTTCacheFromTT'=>array('len'=>2),
-			'initForChart'=>array('len'=>4),
-			'initTTCacheFromTmpObject'=>array('len'=>3),
-			'initTTCacheFromUploadedFile'=>array('len'=>3),
-			'readTTCacheIntervals'=>array('len'=>1),
-			'readIntervalsForChart'=>array('len'=>1),
-			'addTTCacheInterval'=>array('len'=>1),
-			'removeTTCacheIntervalFromId'=>array('len'=>2),
-			'modifyTTCacheInterval'=>array('len'=>1),
-			'operationTTCacheIntervals'=>array('len'=>2),
-			'mergeTTCacheIntervals'=>array('len'=>0),
-			'getTTCacheStatistics'=>array('len'=>0),
-			'sendFeedback'=>array('len'=>1),
-			'saveState'=>array('len'=>1),
-			'loadState'=>array('len'=>1),
-			'sendToSAMP'=>array('len'=>1),
-			'getHstImagesUrl'=>array('len'=>1),
-			'getAPISImagesUrl'=>array('len'=>1),
-			'loadFilterList'=>array('len'=>0),
-			'loadFilters'=>array('len'=>1),
-			'saveFilter'=>array('len'=>1),
-			'createFilter'=>array('len'=>1),
-			'destroyFilter'=>array('len'=>1),
-			'getCrtFilterId'=>array('len'=>0),
-			'getCrtFilterResult'=>array('len'=>0),
-			'setCrtFilterId'=>array('len'=>1),
-			'resetFilter'=>array('len'=>0),
-			'logout'=>array('len'=>1),
-			'getUserInfo'=>array('len'=>0),
-			'convertWS'=>array('len'=>0),
-			'getRun'=>array('len'=>1),
-			'addRun'=>array('len'=>1),
-			//AKKA - New action to clean user WS
-			'cleanUserWS'=>array('len'=>0),
-			'deleteSpecialInfo'=>array('len'=>1),
-			'interactivePlot'=>array('len'=>2),
-			'getParamPlotInit'=>array('len'=>1),
-			'getParamInfo'=>array('len'=>1),
-			'getSharedObjectFolders' => array('len'=>1),
-			'shareObjects' => array('len'=>1),
-			'isSharedObjectNameAlreadyUsed' => array('len'=>1)
-		)
-	)
-);
+$API = array('AmdaAction' => array('methods' => array(
+        'getTree' => array('len' => 1),
+        'saveTree' => array('len' => 1),
+        'getInfo' => array('len' => 1),
+        'doNothing' => array('len' => 1),
+        'deleteFromTree' => array('len' => 1),
+        'getObject' => array('len' => 2),
+        'getAsciiFile' => array('len' => 1),
+        'getTmpObject' => array('len' => 3),
+        'getUploadedObject' => array('len' => 3),
+        'getMyParamInfo' => array('len' => 1),
+        'deleteObject' => array('len' => 1),
+        'renameObject' => array('len' => 1),
+        'createObject' => array('len' => 2),
+        'modifyObject' => array('len' => 1),
+        'validNameObject' => array('len' => 1),
+        'getJobs' => array('len' => 0),
+        'execute' => array('len' => 2),
+    //'formHandler'=>true
+        'compilParam' => array('len' => 1),
+        'compilParamDelete' => array('len' => 1),
+        'killPlotRequest' => array('len' => 0),
+        'merge' => array('len' => 1),
+        'intersect' => array('len' => 1),
+        'loadTTIntervals' => array('len' => 1),
+        'saveTTCacheIntervalsInTT' => array('len' => 1),
+        'initTTCache' => array('len' => 2),
+        'initTTCacheFromTT' => array('len' => 2),
+        'initForChart' => array('len' => 4),
+        'initTTCacheFromTmpObject' => array('len' => 3),
+        'initTTCacheFromUploadedFile' => array('len' => 3),
+        'readTTCacheIntervals' => array('len' => 1),
+        'readIntervalsForChart' => array('len' => 1),
+        'addTTCacheInterval' => array('len' => 1),
+        'removeTTCacheIntervalFromId' => array('len' => 2),
+        'modifyTTCacheInterval' => array('len' => 1),
+        'operationTTCacheIntervals' => array('len' => 2),
+        'mergeTTCacheIntervals' => array('len' => 0),
+        'getTTCacheStatistics' => array('len' => 0),
+        'sendFeedback' => array('len' => 1),
+        'saveState' => array('len' => 1),
+        'loadState' => array('len' => 1),
+        'sendToSAMP' => array('len' => 1),
+        'getHstImagesUrl' => array('len' => 1),
+        'getAPISImagesUrl' => array('len' => 1),
+        'loadFilterList' => array('len' => 0),
+        'loadFilters' => array('len' => 1),
+        'saveFilter' => array('len' => 1),
+        'createFilter' => array('len' => 1),
+        'destroyFilter' => array('len' => 1),
+        'getCrtFilterId' => array('len' => 0),
+        'getCrtFilterResult' => array('len' => 0),
+        'setCrtFilterId' => array('len' => 1),
+        'resetFilter' => array('len' => 0),
+        'logout' => array('len' => 1),
+        'getUserInfo' => array('len' => 0),
+        'convertWS' => array('len' => 0),
+        'getRun' => array('len' => 1),
+        'addRun' => array('len' => 1),
+    //AKKA - New action to clean user WS
+        'cleanUserWS' => array('len' => 0),
+        'deleteSpecialInfo' => array('len' => 1),
+        'interactivePlot' => array('len' => 2),
+        'getParamPlotInit' => array('len' => 1),
+        'getParamInfo' => array('len' => 1),
+        'getSharedObjectFolders' => array('len' => 1),
+        'shareObjects' => array('len' => 1),
+        'isSharedObjectNameAlreadyUsed' => array('len' => 1)
+)));
 ?>
diff --git a/php/my_config.php b/php/my_config.php
index d6ade81..0096554 100644
--- a/php/my_config.php
+++ b/php/my_config.php
@@ -7,11 +7,11 @@
  */
 
 //AKKA - Path to AMDA_Integration base dir
-define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA_Integration/');
+define('INTEGRATION_BASE_PATH', '/AMDA/AMDA_Integration/');
 
 require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
 
-define('CEFLIB', '/usr/local/cef/lib');
+define('CEFLIB', '/opt/local/cef/lib');
 define('CDFLIB', '/opt/local/lib');
 define('SYS_LIBS', '/lib:/usr/lib:/usr/local/lib64');
 define('SYS_BIN','/bin:/usr/bin/:/usr/local/bin/');
@@ -26,9 +26,9 @@ define('log', IHM_SRC_DIR.'LOG');
 // User apache
 define('APACHE_USER', 'apache');
 // Alias for name of AMDA
-define('APACHE_ALIAS', '/NEWAMDA-BENJAMIN/');
+define('APACHE_ALIAS', '/NEWAMDA-NJOURDANE/');
 //email to send errors from AmdaUpdate/AmdaInstall
-define('email','brenard@irap.omp.eu');
+define('email','nathanael.jourdane@irap.omp.eu');
 
 //DDPATH
 define('DDBIN','/opt/local/bin/');
@@ -36,7 +36,7 @@ define('DDLIB','/opt/local/lib/');
 
 // for updateAmda
 define('DD_WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
-define('TITLE', 'AMDANEW-Test');
+define('TITLE', 'NEWAMDA-NJOURDANE');
 
 $is64 = true;
 
diff --git a/php/rest/getDatasetData.php b/php/rest/getDatasetData.php
index 1ba4652..81915ca 100755
--- a/php/rest/getDatasetData.php
+++ b/php/rest/getDatasetData.php
@@ -11,23 +11,22 @@ require_once '../config.php';
 
 $amda_ws = new WebServer();
 
-if (!$_GET["token"]) {
-    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
-}
-if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
-    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+if (!key_exists("token", $_GET)) {
+    $result = array('success' => false, 'message' => "E01: Authentication is required for this webservice.");
+} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    $result = array('success' => false, 'message' => "E02: Token expired. Please authenticate again.");
+} else {
+    $result = $amda_ws->getDataset($_GET);
 }
 
-$result = $amda_ws->getDataset($_GET);
-
 if ($result['success']) {
     $file = str_replace("http://oberoi.cesr.fr/AMDA-WS/", BASE_PATH, $result['dataFileURLs']);
 
     if ($file) {
 // 	header('Content-type: text/xml');
-//         $contenu = file_get_contents($file); 
-// error_log($contenu,3,'/home/natacha/TMP/tmp.xml');        
-// 	echo $contenu; 
+//         $contenu = file_get_contents($file);
+// error_log($contenu,3,'/home/natacha/TMP/tmp.xml');
+// 	echo $contenu;
 
         header('Content-type: text/xml');
         $doc = new DOMDocument();
diff --git a/php/rest/getOrbites.php b/php/rest/getOrbites.php
index e11cfc4..09d29b6 100644
--- a/php/rest/getOrbites.php
+++ b/php/rest/getOrbites.php
@@ -12,15 +12,14 @@ require_once '../config.php';
 
 $amda_ws = new WebServer();
 
-if (!$_GET["token"]) {
-    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
-}
-if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
-    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+if (!key_exists("token", $_GET)) {
+    $result = array('success' => false, 'message' => "E01: Authentication is required for this webservice.");
+} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    $result = array('success' => false, 'message' => "E02: Token expired. Please authenticate again.");
+} else {
+    $result = $amda_ws->getOrbites($_GET);
 }
 
-$result = $amda_ws->getOrbites($_GET);
-
 if ($result['success']) {
     echo $result['dataFileURLs'];
 } else {
diff --git a/php/rest/getParameter.php b/php/rest/getParameter.php
index 05165b4..cf89202 100644
--- a/php/rest/getParameter.php
+++ b/php/rest/getParameter.php
@@ -12,15 +12,14 @@ require_once '../config.php';
 
 $amda_ws = new WebServer();
 
-if (!$_GET["token"]) {
-    return array('success' => false, 'message' => "E01\nAuthentication is required for this webservice.");
-}
-if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
-    return array('success' => false, 'message' => "E02\nToken expired. Please authenticate again.");
+if (!key_exists("token", $_GET)) {
+    $result = array('success' => false, 'message' => "E01: Authentication is required for this webservice.");
+} else if ($amda_ws->getNewToken()['token'] != $_GET["token"]) {
+    $result = array('success' => false, 'message' => "E02: Token expired. Please authenticate again.");
+} else {
+    $result = $amda_ws->getParameter($_GET);
 }
 
-$result = $amda_ws->getParameter($_GET);
-
 if ($result['success']) {
     echo $result['dataFileURLs'];
 } else {
--
libgit2 0.21.2