[Mapbender-commits] r10033 - trunk/mapbender/core

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-01-18 06:01:22 -0800 (Fri, 18 Jan 2019)
New Revision: 10033

Modified:
   trunk/mapbender/core/globalSettings.php
Log:
Rename function because it conflicts with actual geoportal.rlp function name from deprecated integration in typo3

Modified: trunk/mapbender/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php	2019-01-17 19:15:32 UTC (rev 10032)
+++ trunk/mapbender/core/globalSettings.php	2019-01-18 14:01:22 UTC (rev 10033)
@@ -65,7 +65,7 @@
 	$e = new mb_notice("mb_user_name from session: ".$mb_user_name);
         if(!isset($mb_user_name) || $mb_user_name == "" || $mb_user_name == false) {
 	    $e = new mb_notice("No mb_user_name found in SESSION - initialize PUBLIC_USER SESSION");
-	    $isAuthenticated = authenticate(PUBLIC_USER);
+	    $isAuthenticated = getUserData(PUBLIC_USER);
 	    if($isAuthenticated != false){  
 		    Mapbender::session()->set("mb_user_id", $isAuthenticated["mb_user_id"]);
 		    Mapbender::session()->set("mb_user_name", $isAuthenticated["mb_user_name"]);
@@ -88,7 +88,7 @@
     }
 }
 
-function authenticate ($userId){
+function getUserData ($userId){
 	$con = db_connect(DBSERVER,OWNER,PW);
 	db_select_db(DB,$con);
 	$sql = "SELECT * FROM mb_user WHERE mb_user_id = $1";