svn commit: r882 - trunk/mapbender/http/php

christoph at osgeo.org christoph at osgeo.org
Mon Nov 20 10:01:14 EST 2006


Author: christoph
Date: 2006-11-20 15:01:13+0000
New Revision: 882

Modified:
   trunk/mapbender/http/php/mod_deleteFilteredGUI.php
   trunk/mapbender/http/php/mod_deleteGUI.php
   trunk/mapbender/http/php/mod_deleteWFS.php
   trunk/mapbender/http/php/mod_deleteWMS.php

Log:
* include via dirname(__FILE__)
* added parameter to getGuisByOwner

Modified: trunk/mapbender/http/php/mod_deleteFilteredGUI.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_deleteFilteredGUI.php?view=diff&rev=882&p1=trunk/mapbender/http/php/mod_deleteFilteredGUI.php&p2=trunk/mapbender/http/php/mod_deleteFilteredGUI.php&r1=881&r2=882
==============================================================================
--- trunk/mapbender/http/php/mod_deleteFilteredGUI.php	(original)
+++ trunk/mapbender/http/php/mod_deleteFilteredGUI.php	2006-11-20 15:01:13+0000
@@ -18,15 +18,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import_request_variables("PG");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
-require_once("../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 $self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
 
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
 $admin = new administration();
-$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"]);
+$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

Modified: trunk/mapbender/http/php/mod_deleteGUI.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_deleteGUI.php?view=diff&rev=882&p1=trunk/mapbender/http/php/mod_deleteGUI.php&p2=trunk/mapbender/http/php/mod_deleteGUI.php&r1=881&r2=882
==============================================================================
--- trunk/mapbender/http/php/mod_deleteGUI.php	(original)
+++ trunk/mapbender/http/php/mod_deleteGUI.php	2006-11-20 15:01:13+0000
@@ -19,13 +19,13 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
 #$admin = new administration();
-#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"]);
+#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
 $gui_id = $_SESSION["mb_user_gui"];
 ?>
 
@@ -59,7 +59,7 @@
 <body>
 
 <?php
-require_once("../php/mb_getGUIs.php");
+require_once(dirname(__FILE__)."/../php/mb_getGUIs.php");
 $logged_user_name=$_SESSION["mb_user_name"];
 $logged_user_id=$_SESSION["mb_user_id"];
 

Modified: trunk/mapbender/http/php/mod_deleteWFS.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_deleteWFS.php?view=diff&rev=882&p1=trunk/mapbender/http/php/mod_deleteWFS.php&p2=trunk/mapbender/http/php/mod_deleteWFS.php&r1=881&r2=882
==============================================================================
--- trunk/mapbender/http/php/mod_deleteWFS.php	(original)
+++ trunk/mapbender/http/php/mod_deleteWFS.php	2006-11-20 15:01:13+0000
@@ -19,13 +19,13 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
 #$admin = new administration();
-#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"]);
+#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
 $gui_id = $_SESSION["mb_user_gui"];
 ?>
 

Modified: trunk/mapbender/http/php/mod_deleteWMS.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_deleteWMS.php?view=diff&rev=882&p1=trunk/mapbender/http/php/mod_deleteWMS.php&p2=trunk/mapbender/http/php/mod_deleteWMS.php&r1=881&r2=882
==============================================================================
--- trunk/mapbender/http/php/mod_deleteWMS.php	(original)
+++ trunk/mapbender/http/php/mod_deleteWMS.php	2006-11-20 15:01:13+0000
@@ -19,10 +19,10 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
-require_once("../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 $self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
 ?>
 
@@ -73,7 +73,7 @@
 </head>
 <body>
 <?php
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
 $admin = new administration();
 
 $error_msg='';
@@ -179,7 +179,7 @@
 	}
 	// display WMS List
 	
-	$wms_id_own = $admin->getWmsByOwner($_SESSION["mb_user_id"]);
+	$wms_id_own = $admin->getWmsByOwner($_SESSION["mb_user_id"],true);
 	
 	if (count($wms_id_own)>0){
 		$v = array();
@@ -299,7 +299,8 @@
 	    				$owner_mail_addresses = array();
 	    				$email_str = '';
 	    				for ($i=0; $i<count($owner); $i++) {
-	    					$owner_ids[$i] = $admin->getUserIdByUserName($owner[$i]);
+	    					$tmp_array = $admin->getUserIdByUserName($owner[$i]);
+	    					$owner_ids[$i] = $tmp_array[0]; 
 	    				}
 	    				$j=0;
 	    				for ($i=0; $i<count($owner_ids); $i++) {




More information about the Mapbender_commits mailing list