do not check user in PROCESSDELETE function

Elena.Budnik
1 parent 04a579a5
Showing 8 changed files with 97 additions and 54 deletions Show diff stats
desktop.php
generic_data/Functions/functions.xml
generic_data/SpecialSettings/Groups.xml
index.html
js/lib/ext-override.js
php/AmdaUpdate.php
php/classes/AmdaAction.php
php/my_config.php
@@ -30,15 +30,13 @@
     <link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all.css" />
     <link rel="icon" href="favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> 
-    
-<!--  <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
-<!--  <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
-<!--  <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>  -->
- 	<script type="text/javascript" src="js/lib/ext/ext-all.js"></script> 
- <!--  <script type="text/javascript" src="js/lib/ext/ext-all-dev.js">  --> 
- <!--	<script type="text/javascript" src="js/lib/ext-override.js"></script> -->
-
  
+<!--     <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
+<!--     <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
+   <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>--> 
+<!--	<script type="text/javascript" src="js/lib/ext/ext-all.js"></script>  -->  
+<!--	<script type="text/javascript" src="js/lib/ext/ext-all-dev.js"> -->
+<!--   <script type="text/javascript" src="js/lib/ext-override.js"></script> -->
  
 <!-- Direct API -->
      <script type="text/javascript" src="php/api.php"></script> 
@@ -101,6 +101,10 @@
      <info_brief>Arc-tangent</info_brief>
 	 <new_kernel>atan</new_kernel>
    </function>
+   <function name="atan2(,)" kind="idl">
+     <info_brief>Arc-tangent</info_brief>
+	 <new_kernel>atan_2f</new_kernel>
+   </function>
    <function name="cos()" kind="idl">
      <info_brief>cosine</info_brief>
 	 <new_kernel>cos</new_kernel>
@@ -109,11 +113,11 @@
      <info_brief>Hyperbolic cosine</info_brief>
 	  <new_kernel>cosh</new_kernel>
    </function>
-   <function name="deriv_()" kind="idl">
+   <!--<function name="deriv_()" kind="idl">
      <prompt/>
      <info_brief>deriv() function with possibly unequal point spacing</info_brief>
 	  <new_kernel>#deriv</new_kernel>
-   </function>
+   </function>-->
    <function name="exp()" kind="idl">
      <info_brief>Natural exponential function</info_brief>
 	  <new_kernel>exp</new_kernel>
 <?xml version="1.0"?>
 <groups>
-<!--    <group xml:id="Rosetta"><folder name="WS"/><folder name="REQ"/></group>-->
+	<!--<group xml:id="Rosetta"><folder name="WS"/><folder name="REQ"/></group>-->
+	<group xml:id="CU"><folder name="WS"/><folder name="TT"/></group>
 </groups>
-<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Welcome on Amda</title>
<link href="js/resources/css/AccueilAmda.css" rel="stylesheet" type="text/css">
<!-- Login -->
<link rel="stylesheet" type="text/css" href="js/resources/css/login.css" />
<link rel="icon" href="favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> 
</head>

<body>
<div id="centrage">

<div id="trou">

<div id="couvercle"></div>

<div id="TousLesBoutons">
<div id="Btn_FirstVisit" onclick="location.href='help.html';""></div>
<div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
<form method="POST" action="desktop.php">  
	    <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />   
	    <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
     <div><input id="Btn_Login" type="submit" value=""/></div>
</form> 
<a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
<a href="mailto:amda@irap.omp.eu?subject=AMDA contact" id="Btn_Contact"></a>
<a href="http://cdpp.eu/" id="Logo_CDPP"></a>
<div id="PaveGuest">
<div id="TitrePaveGuest">Try AMDA as a guest</div>
<div id="TextePaveGuest">login: guest</div>
<div id="TextePaveGuest">password : your e-mail address</div>
</div>
<div id="Logos_partenaires"></div>

<div id="PaveAnnoucements">
<div id="TitrePaveAnnoucement">Announcements </div>
<div id="DateAnnoucement">12/05/2016</div>
<div id="TexteAnnoucement">New instance for CU tests </div>
</div>

</div><!--TousLesBoutons-->
</div><!--trou-->
</div><!--centrage-->
</body>
</html>
 \ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>AmdaNG Login</title>
+
+<!-- Login -->
+<link rel="stylesheet" type="text/css" href="js/resources/css/login.css" />
+<link rel="icon" href="favicon.ico" type="image/x-icon">
+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> 
+<!--<script type="text/javascript" src="client/misc/cookies.js"></script> -->
+<!--<script type="text/javascript" src="js/login/login.js"></script>-->
+</head>
+
+<body>
+<div id="qo-panel">
+	<!--<img alt="" src="js/resources/images/default/s.gif" class="qo-logo qo-abs-position" />-->
+	<span class="qo-supported qo-abs-position">
+		<b>Supported Browsers</b><br />
+		<a href="http://www.mozilla.org/download.html" target="_blank">Firefox</a><br/>
+		<!--<a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx" target="_blank">Internet Explorer 7+</a><br />-->
+		<!--<a href="http://www.opera.com/download/" target="_blank">Opera 9+</a><br />-->
+		<a href="http://www.apple.com/safari/download/" target="_blank">Safari</a><br/>
+		<a href="http://www.google.com/chrome/" target="_blank">Google-Chrome</a>
+	</span>
+
+ 	<a href="http://www.extjs.com/" target="_blank">
+        <img alt="" src="js/resources/images/s.gif" class="qo-extjs-logo qo-abs-position" /></a>	
+	<span class="qo-library qo-abs-position">
+	   built with the <a href="http://www.extjs.com/" target="_blank">Ext JS</a> library.
+	</span>	
+
+	<span class="qo-signup-link qo-abs-position">
+		<a href="signup.html">I want to sign up</a>
+	</span>
+	
+	<span class="qo-forgot-link qo-abs-position">
+		<a href="forgot-password.html">I forgot my password</a>
+	</span>
+	 <form method="POST" action="desktop.php">  
+	    <label id="field1-label" class="qo-abs-position">Login</label>
+	    <input class="qo-abs-position" type="text" name="username" id="field1" />
+	    
+	    <label id="field2-label" class="qo-abs-position">Password</label>
+	    <input  class="qo-abs-position" type="password" name="password" id="field2" />
+            <input id="submitBtn" class="qo-submit qo-abs-position" type="submit" value=""/>
+	 </form>   
+	 
+	<!--<input id="resetBtn" class="qo-reset qo-abs-position" type="image" src="js/resources/images/s.gif" />-->
+</div>
+
+</body>
+</html>
 \ No newline at end of file
@@ -95,10 +95,25 @@ Ext.onReady(function () {
 	  comp.setPosition(x,y);
       }
     }      
-    });*/  
-	       
+    }); 
  
-	/*Ext.override(Ext.selection.Model, {
+    Ext.override(Ext.selection.TreeModel, {
+	    
+	onRowClick: function (view, record, item, index, e) {
+		// Record index will be -1 if the clicked record is a metadata record and not selectable		 
+  		if (index !== -1) {
+			if (!this.allowRightMouseSelection(e)) {			      
+				return ;			 
+			}
+	
+			//Don't process if it's a right-click over a previously selected record.
+			// if (!(e.type === 'contextmenu' && this.isSelected(record))) {
+				this.processSelection(view, record, item, index, e);
+			// }
+		} 
+	}
+    });
+	Ext.override(Ext.selection.Model, {
 		storeHasSelected: function(record) {
 			var store = this.store,
 				records,
@@ -21,8 +21,7 @@
   	    exit(1);
      }
      $updateOnly = false;
-  }
-    
+  }    
  
    $amda = new AmdaClient($updateOnly);
  
@@ -37,35 +36,6 @@
             }   */  
         }       
  
-
-  $locBases = $amda->getAvailableMissions();
-
-    if(is_string($locBases)) {
-      $msg = "Warning: No Local Amda Data info exists!".PHP_EOL;
-      print_r($msg); 
-     }
-    else  {
-
-/*
-*  update DD_*.xml files for local bases. If 'updateOnly', we keep DD_*.xml that already exists to not erase current user modifications.
-*/ 
-    $amda->getDDLocalParamsFiles($locBases);
-    
-/*
-*  Update Start Stop for AMDA local data
-*/ 
-    $ok =   $amda->updateStartStop($locBases);  
-
-/*
- *  Create/update Orbites.xml file
- */ 
-//   if (!$updateOnly) { 
-//       $postProcessing = new PostProcessing();
-//       $postProcessing->createOrbites();
-//       $postProcessing->createOrbites(LocalDataParam.'InternalParams.xml');
-//       $postProcessing->createOrbitesInfoFiles($locBases);
-//     }
-
 /*
 *  Get available external bases if exist 
 */
@@ -906,9 +906,11 @@ class AmdaAction
  
 	private function executeRequest($obj, $function)
 	{
-		$res = $this->checkUser($obj);
-		if (!$res['success']) return $res;
-
+		if ($function != FunctionTypeEnumClass::PROCESSDELETE) {
+			$res = $this->checkUser($obj);
+			if (!$res['success']) return $res;
+		}
+		
 		$requestManager = new RequestManagerClass();
  
 		try
@@ -3,18 +3,18 @@
  * @file my_config.php
  * @version $Id: my_config.php 2372 2014-05-21 09:38:38Z myriam $
  *
- *
  */
  
 //AKKA - Path to AMDA_Integration base dir
-define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA_Integration/');
+define('INTEGRATION_BASE_PATH', '/home/budnik/AMDA/AMDA_Integration/');
  
 require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
  
 define('CEFLIB', '/usr/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/');
+define('SYS_BIN',  '/bin:/usr/bin/:/usr/local/bin/');
  
 //AKKA - For compatibility with IHM
 define('BASE_PATH', IHM_SRC_DIR);
@@ -26,9 +26,9 @@ define(&#39;log&#39;, IHM_SRC_DIR.&#39;LOG&#39;);
 // User apache
 define('APACHE_USER', 'apache');
 // Alias for name of AMDA
-define('APACHE_ALIAS', '/NEWAMDA-BENJAMIN/');
+define('APACHE_ALIAS', '/NEWAMDA/');
 //email to send errors from AmdaUpdate/AmdaInstall
-define('email','brenard@irap.omp.eu');
+define('email','ebudnik@irap.omp.eu');
  
 //DDPATH
 define('DDBIN','/opt/local/bin/');
@@ -38,6 +38,7 @@ define(&#39;DDLIB&#39;,&#39;/opt/local/lib/&#39;);
 define('DD_WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
 define('TITLE', 'AMDANEW-Test');
  
+
 $is64 = true;
  
 ?>