[Mapbender-commits] r8745 - in trunk/mapbender: http/php owsproxy/http tools

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-12-02 01:45:55 -0800 (Mon, 02 Dec 2013)
New Revision: 8745

Modified:
   trunk/mapbender/http/php/wms.php
   trunk/mapbender/owsproxy/http/index.php
   trunk/mapbender/tools/mod_mailAbo.php
   trunk/mapbender/tools/mod_monitorCapabilities_main.php
Log:
Some fixes for new php5.4 - thanx to stefan wannemacher ;-)

Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php	2013-12-02 09:26:46 UTC (rev 8744)
+++ trunk/mapbender/http/php/wms.php	2013-12-02 09:45:55 UTC (rev 8745)
@@ -1288,7 +1288,7 @@
 	while ($sub_layer_row = db_fetch_array($res_sub_layer_sql)) {
 		$subLayer = createLayerElement($doc, $wmsId, $sub_layer_row, $wms_row);
 		//recursive creation
-		createLayerTree($sub_layer_row['layer_pos'], $withChilds, $layerId, &$subLayer, $wmsId, $doc, $wms_row);
+		createLayerTree($sub_layer_row['layer_pos'], $withChilds, $layerId, $subLayer, $wmsId, $doc, $wms_row);
 		$layer->appendChild($subLayer);
 	}
 }

Modified: trunk/mapbender/owsproxy/http/index.php
===================================================================
--- trunk/mapbender/owsproxy/http/index.php	2013-12-02 09:26:46 UTC (rev 8744)
+++ trunk/mapbender/owsproxy/http/index.php	2013-12-02 09:45:55 UTC (rev 8745)
@@ -572,7 +572,7 @@
 }
 
 function matchUrls($content){
-	if(!session_is_registered("owsproxyUrls")){ //TODO: exchange function, because it is deprecated and will not longer be supported by php 5.4!
+	if(!isset($_SESSION["owsproxyUrls"])){ 
 		$_SESSION["owsproxyUrls"] = array();
 		$_SESSION["owsproxyUrls"]["id"] = array();
 		$_SESSION["owsproxyUrls"]["url"] = array();

Modified: trunk/mapbender/tools/mod_mailAbo.php
===================================================================
--- trunk/mapbender/tools/mod_mailAbo.php	2013-12-02 09:26:46 UTC (rev 8744)
+++ trunk/mapbender/tools/mod_mailAbo.php	2013-12-02 09:45:55 UTC (rev 8745)
@@ -139,7 +139,7 @@
 				$user, 
 				$mail_user_topic . " " . date("F j, Y, G:i:s"), 
 				utf8_decode($body), 
-				&$error_msg
+				$error_msg
 			);
 		}
 		else {

Modified: trunk/mapbender/tools/mod_monitorCapabilities_main.php
===================================================================
--- trunk/mapbender/tools/mod_monitorCapabilities_main.php	2013-12-02 09:26:46 UTC (rev 8744)
+++ trunk/mapbender/tools/mod_monitorCapabilities_main.php	2013-12-02 09:45:55 UTC (rev 8745)
@@ -336,7 +336,7 @@
 				$user, 
 				"Mapbender monitoring report " . date("F j, Y, G:i:s", $time), 
 				utf8_decode($body), 
-				&$error_msg
+				$error_msg
 			);
 		}
 		else {