[Mapbender-commits] r1764 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-10-29 07:11:49 -0400 (Mon, 29 Oct 2007)
New Revision: 1764

Modified:
   trunk/mapbender/http/php/mod_deleteWMS.php
Log:
wms owner: ids instead of names

Modified: trunk/mapbender/http/php/mod_deleteWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteWMS.php	2007-10-29 11:09:43 UTC (rev 1763)
+++ trunk/mapbender/http/php/mod_deleteWMS.php	2007-10-29 11:11:49 UTC (rev 1764)
@@ -273,7 +273,7 @@
 			$owner = $admin->getOwnerByWms($wmsList);
 			if ($owner && count($owner)>0) {
 				for($i=0; $i<count($owner); $i++){
-					echo "- ".$owner[$i]."<br>";	
+					echo "- ".$admin->getUserNameByUserId($owner[$i])."<br>";	
 				}
 			}
 			else echo "<i>- none -</i>";
@@ -286,22 +286,18 @@
 			
 			//now, any owner can delete, any non-owner can suggest deletions
 			//if a wms has no owner, anyone can delete
-	    		if($owner && in_array($_SESSION["mb_user_name"], $owner) && count($owner) == 1) {
+	    		if($owner && in_array($_SESSION["mb_user_id"], $owner) && count($owner) == 1) {
 	    			echo "<input class='button_del' type='button' value='delete' onclick='validate()'>";
 	    		}
-	    		elseif ($owner && in_array($_SESSION["mb_user_name"], $owner) && count($owner) > 1) {
+	    		elseif ($owner && in_array($_SESSION["mb_user_id"], $owner) && count($owner) > 1) {
 	    			
 	    			// delete suggestion button only appears when mailing is enabled in mapbender.conf
 	    			if ($use_php_mailing) {
 	    			
 	    				// prepare email-addresses and usernames of all owners
-	    				$owner_ids = array();
+	    				$owner_ids = $owner;
 	    				$owner_mail_addresses = array();
 	    				$email_str = '';
-	    				for ($i=0; $i<count($owner); $i++) {
-	    					$tmp_array = $admin->getUserIdByUserName($owner[$i]);
-	    					$owner_ids[$i] = $tmp_array[0]; 
-	    				}
 	    				$j=0;
 	    				for ($i=0; $i<count($owner_ids); $i++) {
 	    					$adr_tmp = $admin->getEmailByUserId($owner_ids[$i]);