[Mapbender-commits] r3867 - branches/2.6/lib trunk/mapbender/lib

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-04-08 05:27:11 -0400 (Wed, 08 Apr 2009)
New Revision: 3867

Modified:
   branches/2.6/lib/ajax.js
   branches/2.6/lib/ajax.php
   trunk/mapbender/lib/ajax.js
   trunk/mapbender/lib/ajax.php
Log:
bug fixes

Modified: branches/2.6/lib/ajax.js
===================================================================
--- branches/2.6/lib/ajax.js	2009-04-07 18:38:30 UTC (rev 3866)
+++ branches/2.6/lib/ajax.js	2009-04-08 09:27:11 UTC (rev 3867)
@@ -202,6 +202,7 @@
 		// the ajax request reports success
 		if (resultObj.result && typeof(resultObj.result) == "object" &&
 			resultObj.result.data && typeof(resultObj.result.data) == "object") {
+
 			if (id != resultObj.id) {
 				message = Mapbender.Ajax.Messages.idMismatchError;
 				new Mb_warning(message);
@@ -211,9 +212,9 @@
 
 			success = true;
 
-			if (resultObj.result.data.message) {
-				message = resultObj.data.message;
-				status = resultObj.data.message;
+			if (resultObj.result.message) {
+				message = resultObj.result.message;
+				status = resultObj.result.message;
 			}
 			result = resultObj.result.data;
 		}

Modified: branches/2.6/lib/ajax.php
===================================================================
--- branches/2.6/lib/ajax.php	2009-04-07 18:38:30 UTC (rev 3866)
+++ branches/2.6/lib/ajax.php	2009-04-08 09:27:11 UTC (rev 3867)
@@ -48,7 +48,7 @@
 
 	protected function initializeFromArray ($requestArray) {
 		if ($requestArray["id"]) {
-			$this->id = $requestArray["id"];
+			$this->id = intval($requestArray["id"]);
 		}
 		
 		if ($requestArray["method"]) {

Modified: trunk/mapbender/lib/ajax.js
===================================================================
--- trunk/mapbender/lib/ajax.js	2009-04-07 18:38:30 UTC (rev 3866)
+++ trunk/mapbender/lib/ajax.js	2009-04-08 09:27:11 UTC (rev 3867)
@@ -202,6 +202,7 @@
 		// the ajax request reports success
 		if (resultObj.result && typeof(resultObj.result) == "object" &&
 			resultObj.result.data && typeof(resultObj.result.data) == "object") {
+
 			if (id != resultObj.id) {
 				message = Mapbender.Ajax.Messages.idMismatchError;
 				new Mb_warning(message);
@@ -211,9 +212,9 @@
 
 			success = true;
 
-			if (resultObj.result.data.message) {
-				message = resultObj.data.message;
-				status = resultObj.data.message;
+			if (resultObj.result.message) {
+				message = resultObj.result.message;
+				status = resultObj.result.message;
 			}
 			result = resultObj.result.data;
 		}

Modified: trunk/mapbender/lib/ajax.php
===================================================================
--- trunk/mapbender/lib/ajax.php	2009-04-07 18:38:30 UTC (rev 3866)
+++ trunk/mapbender/lib/ajax.php	2009-04-08 09:27:11 UTC (rev 3867)
@@ -48,7 +48,7 @@
 
 	protected function initializeFromArray ($requestArray) {
 		if ($requestArray["id"]) {
-			$this->id = $requestArray["id"];
+			$this->id = intval($requestArray["id"]);
 		}
 		
 		if ($requestArray["method"]) {