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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-12-18 07:09:02 -0800 (Wed, 18 Dec 2019)
New Revision: 10376

Modified:
   trunk/mapbender/http/classes/class_wms.php
   trunk/mapbender/http/php/mod_updateWMS.php
Log:
Fix registrating wms error when wms is authenticated - wrong userId was written on owner column!

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2019-12-18 12:33:08 UTC (rev 10375)
+++ trunk/mapbender/http/classes/class_wms.php	2019-12-18 15:09:02 UTC (rev 10376)
@@ -1931,10 +1931,9 @@
 	*
 	* this function exports the information from the xml to the mapbender database, defaults owner to root if invoked from cli
 	*/
-	function writeObjInDB($gui_id, $cli=false, $ownerId=1){
+	function writeObjInDB($gui_id, $auth=false, $cli=false, $ownerId=1){
 		global $con;
-		if (func_num_args() == 2) { //new for HTTP Authentication
-			$auth = func_get_arg(1);
+		if ($auth !== false) { //new for HTTP Authentication
 			$username = $auth['username'];
 			$password = $auth['password'];
 			$authType = $auth['auth_type'];

Modified: trunk/mapbender/http/php/mod_updateWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_updateWMS.php	2019-12-18 12:33:08 UTC (rev 10375)
+++ trunk/mapbender/http/php/mod_updateWMS.php	2019-12-18 15:09:02 UTC (rev 10376)
@@ -569,7 +569,7 @@
 				$body .= "\n\n"._mb("Attention - following layers have been renamed").":\n".$layerChangeInformation;
 			}
 			$error_msg = "";
-
+$e = new mb_exception("replyto: ". $replyto. " - from: ".$from);
 			for ($i=0; $i<count($notification_mail_addresses); $i++) {
 				if (!$admin->sendEmail($replyto, $from, $notification_mail_addresses[$i], $notification_mail_addresses[$i], _mb("Update of an observed WMS"), utf8_decode($body), $error)) {
 					if ($error){