[Mapbender-commits] r7599 - in trunk/mapbender/http: classes javascripts php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-02-14 08:37:52 -0800 (Mon, 14 Feb 2011)
New Revision: 7599

Modified:
   trunk/mapbender/http/classes/class_wmc.php
   trunk/mapbender/http/javascripts/mod_loadwmc.js
   trunk/mapbender/http/php/mod_loadwmc_server.php
Log:
new handling for public wmc docs: elementVar (js) showPublic=1/0 for loadwmc

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2011-02-14 16:32:01 UTC (rev 7598)
+++ trunk/mapbender/http/classes/class_wmc.php	2011-02-14 16:37:52 UTC (rev 7599)
@@ -272,16 +272,17 @@
 		return array_keys( array_flip(array_merge($wmcOwnerArray, $publicWmcIdArray)));
 	}
 
-	public function selectByUser ($user) {
+	public function selectByUser ($user, $showPublic=0) {
 		$wmcArray = array();
 
 		// get WMC ids
 		$wmcOwnerArray = $user->getWmcByOwner();
-
-		$publicWmcIdArray = self::getPublicWmcIds();
-
-		$wmcIdArray = array_keys( array_flip(array_merge($wmcOwnerArray, $publicWmcIdArray)));
-
+		if ($showPublic==1) {
+			$publicWmcIdArray = self::getPublicWmcIds();
+			$wmcIdArray = array_keys( array_flip(array_merge($wmcOwnerArray, $publicWmcIdArray)));
+		} else {
+			$wmcIdArray=$wmcOwnerArray;
+		}
 		// get WMC data
 		$v = array();
 		$t = array();

Modified: trunk/mapbender/http/javascripts/mod_loadwmc.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadwmc.js	2011-02-14 16:32:01 UTC (rev 7598)
+++ trunk/mapbender/http/javascripts/mod_loadwmc.js	2011-02-14 16:37:52 UTC (rev 7599)
@@ -15,6 +15,7 @@
 options.listWmc = typeof options.listWmc === "number" ? options.listWmc : 1;
 options.saveWmcTarget = typeof options.saveWmcTarget === "string" ? options.saveWmcTarget : "savewmc";
 options.editWmc = typeof options.editWmc === "number" ? options.editWmc : 1;
+options.showPublic = typeof options.showPublic === "number" ? options.showPublic : 0;
 
 Mapbender.events.init.register(function () {
 	if(Mapbender.modules[options.saveWmcTarget] && Mapbender.modules[options.saveWmcTarget].overwrite === 1) {
@@ -256,9 +257,13 @@
 	};
 	//end of the link-handle popup	
 	this.refreshList = function () {
+		//alert("Options showPublic: "+options.showPublic);
 		var req = new Mapbender.Ajax.Request({
 			url: serverSideFileName,
 			method: "getWmc",
+			parameters: {
+				showPublic: options.showPublic
+			},
 			callback: function(obj, result, message){
 				if (!result) {
 					new Mapbender.Exception(obj.message);

Modified: trunk/mapbender/http/php/mod_loadwmc_server.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwmc_server.php	2011-02-14 16:32:01 UTC (rev 7598)
+++ trunk/mapbender/http/php/mod_loadwmc_server.php	2011-02-14 16:37:52 UTC (rev 7599)
@@ -19,7 +19,9 @@
 
 	// gets available WMCs
 	case "getWmc":
-		$resultObj["wmc"] = $wmc->selectByUser($currentUser);
+		$showPublic = $ajaxResponse->getParameter("showPublic");
+		//$e = new mb_notice("mod_loadwmc_server.php: showPublic: ".$showPublic);
+		$resultObj["wmc"] = $wmc->selectByUser($currentUser,$showPublic);
 		$ajaxResponse->setResult($resultObj);
 		$ajaxResponse->setSuccess(true);		
 	break;