Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Benjamin Renard
2 parents 5d224ec6 ddc58615
Showing 4 changed files with 13 additions and 18 deletions Show diff stats
index.html
js/app/views/ExplorerUI.js
js/app/views/PlotTabResultUI.js
php/classes/UserMgr.php
@@ -63,12 +63,12 @@
      })(window.location.search.substr(1).split('&'));
  
      if (qs["error"] && qs["error"] == "1") {
-       alert('Cannot connect to AMDA');
+        alert('Cannot connect to AMDA. \n Please check your username/password');
+        setLoginLoader(false);
        return false;
      }
  
      setLoginLoader(false);
-     
   };
 </script>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
@@ -597,7 +597,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'localParam' :
 							case 'remoteParam':
 							case 'remoteSimuParam':
-								record.createAlias(record);
+								record.createPlot(record);
 								break;
 							case 'bkgWorks' :
 								if (!record.get('object')) {
@@ -376,6 +376,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
  
 	updatePlotImage: function(configResult, newPlot) {
 		this.crtContext = configResult.context;
+                                        
  
 		this.crtTTFileIndex = configResult.ttFileIndex;
  
@@ -509,15 +510,8 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					var ttFileIndex = this.crtTTFileIndex;
 					var ttintervalIndex = this.crtContext.page.ttIndex;
  
-					if (ttintervalIndex <= 0){
-						if (ttFileIndex <= 0){
-							myDesktopApp.errorMsg('You are on the first interval of your request');
-							return;
-						}
-						else {
-							--ttFileIndex;
-							ttintervalIndex = 0;
-						}
+					if (ttintervalIndex <= 0 && ttFileIndex>0){  
+                                                                                                                     --ttFileIndex;                                                                                                      
 					}
 					else
 						--ttintervalIndex;
@@ -533,6 +527,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					var ttintervalIndex = this.crtContext.page.ttIndex;
  
 					if (ttintervalIndex >= this.crtContext.page.ttNbIntervals-1){
+                                                                                                          
 						++ttFileIndex;
 						ttintervalIndex = 0;
 					}
@@ -714,34 +714,34 @@ class UserMgr
 		return $wsSize;
 	}
  
-	// http://www.ilovejackdaniels.com/php/email-address-validation/ 
+    // http://www.ilovejackdaniels.com/php/email-address-validation/ 
 	public function check_email_address($email) 
 	{
 		// First, we check that there's one @ symbol, and that the lengths are right
-		if (!ereg("^[^@]{1,64}@[^@]{1,255}$", $email)) 
+		 if (!preg_match("/^[^@]{1,64}@[^@]{1,255}$/", $email)) 
 		{
 		// Email invalid because wrong number of characters in one section, or wrong number of @ symbols.
 			return false;
 		}
-
+		
 		// Split it into sections to make life easier
 		$email_array = explode("@", $email);
 		$local_array = explode(".", $email_array[0]);
 		for ($i = 0; $i < sizeof($local_array); $i++) 
 		{
-			if (!ereg("^(([A-Za-z0-9!#$%&'*+/=?^_`{|}~-][A-Za-z0-9!#$%&'*+/=?^_`{|}~\.-]{0,63})|(\"[^(\\|\")]{0,62}\"))$", $local_array[$i])) {
+			 if (!preg_match("@^(([A-Za-z0-9!#$%&'*+/=?^_`{|}~-][A-Za-z0-9!#$%&'*+/=?^_`{|}~\.-]{0,63})|(\"[^(\\|\")]{0,62}\"))$@", $local_array[$i])) {
 				return false;
 			}
 		}
  
-		if (!ereg("^\[?[0-9\.]+\]?$", $email_array[1])) { // Check if domain is IP. If not, it should be valid domain name
+		if (!preg_match("/^\[?[0-9\.]+\]?$/", $email_array[1])) { // Check if domain is IP. If not, it should be valid domain name
 			$domain_array = explode(".", $email_array[1]);
 			if (sizeof($domain_array) < 2) {
 				return false; // Not enough parts to domain
 			}
 			for ($i = 0; $i < sizeof($domain_array); $i++) 
 			{
-				if (!ereg("^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]+))$", $domain_array[$i])) {
+				if (!preg_match("/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]+))$/", $domain_array[$i])) {
 					return false;
 				}
 			}