Fix upload from samp notification (#5765)

Benjamin Renard
1 parent 4607eaa0
Showing 5 changed files with 50 additions and 42 deletions Show diff stats
js/app/controllers/UploadModule.js
js/app/views/UploadPanelUI.js
js/app/views/UploadUI.js
php/classes/AmdaObjectMgr.php
php/classes/VOTableMgr.php
@@ -40,20 +40,20 @@ Ext.define(&#39;amdaDesktop.UploadModule&#39;, {
 		var desktop = myDesktopApp.getDesktop();
 		var win = desktop.getWindow(me.id);
 		if (!win) {
-			loadMask.show();
 			this.createWindow(function (o)
 			{
 				win = desktop.getWindow(me.id);
 				if (win){
-					win.items.items[0].forceUpload(url,format);
-					win.close();
+					win.items.items[0].forceUpload(url,format, function() {
+						win.close();
+					});
 				}
-				loadMask.hide();
 			});
 		}
 		else {
-			win.items.items[0].forceUpload(url,format);
-			win.close();
+			win.items.items[0].forceUpload(url,format,function() {
+				win.close();
+			});
 		}
 	}	
 });
@@ -176,10 +176,20 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 	/*
 	* 
 	*/
-	forceUpload : function (url,format)
+	forceUpload : function (url,format,onFinish)
 	{
-		this.getForm().findField('filesrc').setValue('URL');	
+		var re = /http:\/\/127.0.0.1:/;
+		var isRemoteUrl = !re.test(url);
+
+		if (!isRemoteUrl) {
+			myDesktopApp.warningMsg("Cannot load data from a local application.");
+			if (onFinish)
+				onFinish();
+			return;
+		}
+		this.getForm().findField('filesrc').setValue('URL');
+		this.getForm().findField('remoteFile').setValue(url);
 		switch (format)
 		{
 			case 'votable' :
@@ -191,36 +201,39 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 			default :
 						//ToDo Error - unknown format
 						return;
-	}                
-		this.getForm().findField('remoteFile').setValue(url);
-		
-		this.postUpload();
+		}                
+		this.postUpload(onFinish);
 	},
 	/*
 	* 
 	*/
-	postUpload : function()
+	postUpload : function(onFinish)
 	{
 		// 'global' form containing 'partial' forms				      
 		var form = this.getForm();
 		// special validation 	            
 		if(this.validate())
-		{						
+		{
+			loadMask.show();					
 			form.submit({
 				scope: this,
 				url: 'php/uploadFile.php',
 				waitMsg: 'Uploading your file...',
 				success: function(form, o)
-				{   
+				{
+					if (onFinish)
+						onFinish();
 					this.tmpNode = Ext.create(this.nodeType,{leaf : true, text : o.result.file});
-					loadMask.show();
 					AmdaAction.getUploadedObject(o.result.file, o.result.format, this.tmpNode.get('nodeType'), this.getObjectCallback, this);
+					loadMask.hide();
 				},
 				failure: function(form, o) 
-				{                    
-					loadMask.hide();                       
+				{
+					if (onFinish)
+						onFinish();
+					loadMask.hide();
 					myDesktopApp.errorMsg('Error '+o.result.error); 
 				}
 			});
@@ -55,10 +55,10 @@ Ext.define(&#39;amdaUI.UploadUI&#39;, {
 		Ext.apply (this, Ext.apply(arguments, myConf));
 	},
-	forceUpload : function(url,format) 
+	forceUpload : function(url,format,onFinish) 
 	{
 		//this.setDisabled(true);
-		this.items.items[0].items.items[0].forceUpload(url,format);
+		this.items.items[0].items.items[0].forceUpload(url,format,onFinish);
 		//this.setDisabled(false);
 	}	
 });
@@ -124,7 +124,7 @@ class AmdaObjectMgr
 	      foreach($obj as $key => $value) 
 	      {
-				if ($key != 'id' && $key != 'leaf' && $key != 'nodeType' && !is_array($value)) 
+				if ($key != 'id' && $key != 'leaf' && $key != 'nodeType' && !is_array($value) && !is_object($value)) 
 				{
 					$node =  $this->objectDom->createElement($key,htmlspecialchars($value)); 
 					$root -> appendChild($node);
@@ -241,16 +241,9 @@ class VOTableMgr {
   public function getFirstTR()
   {
-  	 if (!$this->xp)
-  	   return NULL;
-
-  	 /*$trs = $this->xp->query($this->queryTR());
-
-  	 if ($trs->length < 1)
+  	 if (!isset($this->xp))
   	   return NULL;
-  	 return $trs->item(0);*/
-
   	 $tabledatas = $this->xp->query($this->queryTableData());
   	 if ($tabledatas->length < 1)
@@ -259,21 +252,23 @@ class VOTableMgr {
   	 $tabledata = $tabledatas->item(0);
   	 $node = $tabledata->firstChild;
+	 if (!isset($node))
+		return NULL;
-  	 while($node && ($node->nodeType != 1) && ($node->nodeName != "TR"))
-      $node = $node->nextSibling;
+	 if (($node->nodeType != XML_ELEMENT_NODE) || ($node->nodeName != "TR"))
+		return $this->getNextTR($node);
-    return $node;
+    	return $node;
   }
   public function getNextTR($tr)
   {
-  	 if (!$this->xp)
+  	 if (!isset($this->xp) || !isset($tr) || !isset($tr->nextSibling))
   	   return NULL;
-    while($tr->nextSibling && ($tr->nextSibling->nodeType != 1) && ($node->nodeName != "TR"))
-      $tr = $tr->nextSibling;
-				return $tr->nextSibling;
+	if (($tr->nextSibling->nodeType != XML_ELEMENT_NODE) || ($tr->nextSibling->nodeName != "TR"))
+		return $this->getNextTR($tr->nextSibling);
+	return $tr->nextSibling;
   }
   public function getTDValueByFieldIndex($tr,$field_index)
@@ -392,24 +387,24 @@ class VOTableMgr {
     $tr = $this->getFirstTR();
-    if (!$tr)
+    if (!isset($tr))
       return '0 0';
     $start = $this->getTDValueByFieldIndex($tr,$timeIndex);
     $stop = $start;
-    while ($tr)
+    while (isset($tr))
     {
       $stop = $this->getTDValueByFieldIndex($tr,$timeIndex);
       $tr = $this->getNextTR($tr);
     }
-    if (!$start)
+    if (!isset($start))
       $start = 0;
     else
       $start = strtotime($start);
-    if (!$stop)
+    if (!isset($stop))
       $stop = 0;
     else
       $stop = strtotime($stop);
@@ -663,11 +658,11 @@ class VOTableMgr {
                    "maxSampling" => 0);
     $prevTime = 0;
-    while ($tr)
+    while (isset($tr))
     {
       $time = $this->getTDValueByFieldIndex($tr,$timeIndex);
-      if ($time)
+      if (isset($time))
       {
         $time = strtotime($time);
         if (($prevTime > 0) && ($time-$prevTime > 0))