[Mapbender-commits] r2255 - in branches/nimix_dev: . conf http/javascripts http/php

Fri Mar 14 08:12:34 EDT 2008

Author: nimix
Date: 2008-03-14 08:12:34 -0400 (Fri, 14 Mar 2008)
New Revision: 2255

Modified:
   branches/nimix_dev/
   branches/nimix_dev/conf/
   branches/nimix_dev/http/javascripts/mod_addWMSfromfilteredList_ajax.php
   branches/nimix_dev/http/php/mod_createUser.php
Log:
merge 2.5 changes


Property changes on: branches/nimix_dev
___________________________________________________________________
Name: subclipse:tags
   + 1955,mapbender_sld,/branches/mapbender_sld,branch
2222,2.4.5,/branches/2.4.5,branch
2225,2.4.5_rc1,/branches/2.4.5_rc1,branch
2249,2.5,/branches/2.5,branch
410,2.4.rc1,/tags/2.4.rc1,tag
626,2.4.rc2,/tags/2.4.rc2,tag
742,2.4,/tags/2.4,tag
1229,2.4.1,/tags/2.4.1,tag
1424,2.4.2.rc1,/tags/2.4.2.rc1,tag
1674,2.4.2,/tags/2.4.2,tag
1678,2.4.3.rc1,/tags/2.4.3.rc1,tag
1713,2.4.3,/tags/2.4.3,tag
1880,2.4.4_rc1,/tags/2.4.4_rc1,tag
1941,2.4.4,/tags/2.4.4,tag
2049,2.4.4_su,/tags/2.4.4_su,tag
2249,nimix_dev,/branches/nimix_dev,branch
Name: svn:ignore
   + .project



Property changes on: branches/nimix_dev/conf
___________________________________________________________________
Name: svn:ignore
   + mapbender.conf


Modified: branches/nimix_dev/http/javascripts/mod_addWMSfromfilteredList_ajax.php
===================================================================

--- branches/nimix_dev/http/javascripts/mod_addWMSfromfilteredList_ajax.php	2008-03-14 11:35:30 UTC (rev 2254)
+++ branches/nimix_dev/http/javascripts/mod_addWMSfromfilteredList_ajax.php	2008-03-14 12:12:34 UTC (rev 2255)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -58,7 +58,7 @@
 try{if(capabilitiesInput){}}catch(e){capabilitiesInput='0';};
 
 var global_source = "capabilities";  // "capabilities" || "db"
-var phpUrl = "../php/mod_addWMSfromfilteredList_server.php";
+var phpUrl = "../php/mod_addWMSfromfilteredList_server.php<?php echo $urlParameters;?>";
 
 // ----------------- Load service --------------------
 

Modified: branches/nimix_dev/http/php/mod_createUser.php
===================================================================
--- branches/nimix_dev/http/php/mod_createUser.php	2008-03-14 11:35:30 UTC (rev 2254)
+++ branches/nimix_dev/http/php/mod_createUser.php	2008-03-14 12:12:34 UTC (rev 2255)
@@ -19,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_gui.php");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 

