[Mapbender-commits] r9929 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-07-26 04:03:49 -0700 (Thu, 26 Jul 2018)
New Revision: 9929

Modified:
   trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php
Log:
Fix for emails with (at) - replace them with @ in ckan export interface - also at another place ;-)

Modified: trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php
===================================================================
--- trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php	2018-07-26 10:58:30 UTC (rev 9928)
+++ trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php	2018-07-26 11:03:49 UTC (rev 9929)
@@ -132,8 +132,8 @@
 	$maxDate = max($timestamps);
 	//
 	$package->timestamp = $maxDate;
-	$package->point_of_contact_email = $mbArray['group_email'];//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
-	$package->maintainer_email = $mbArray['group_email'];//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
+	$package->point_of_contact_email = str_replace("(at)", "@", $mbArray['group_email']);//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
+	$package->maintainer_email = str_replace("(at)", "@", $mbArray['group_email']);//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
 	$package->license = $mbArray['tou_licence_title'];//"Datenlizenz Deutschland – Namensnennung – nicht kommerziell"; // termsofuse.description
 	$package->author = $mbArray['mb_user_id'];//""; //mb_group.mb_group_name
 	$package->url = 'http://www.geoportal.rlp.de';//""; //mb_group.mb_group_name
@@ -218,9 +218,9 @@
 	}
 	
 	$package->author_address->url = $mbArray['mb_user_id'];// null; //null
-	$package->author_address->email = $mbArray['mb_user_id'];// ""; // ""
+	$package->author_address->email = str_replace("(at)", "@", $mbArray['mb_user_id']);// ""; // ""
 	$package->maintainer_address->url = $mbArray['group_homepage'];//$mbArray['service_address'];// null; //mb_group.mb_group_homepage
-	$package->maintainer_address->email = $mbArray['service_email'];// ""; //mb_group.mb_group_email
+	$package->maintainer_address->email = str_replace("(at)", "@", $mbArray['service_email']);// ""; //mb_group.mb_group_email
 	$package->maintainer_address->free_address = $mbArray['service_address']."\r\n".$mbArray['service_postcode']." ".$mbArray['service_city'];// null; //mb_group.mb_group_address - more things with \r\n mb_group_voicetelephone, ...
 	$package->terms_of_use->license_id = $mbArray['tou_licence_id'];// "ger-name-nc"; //termsofuse.name - OK
 	$package->terms_of_use->license_title = $mbArray['tou_licence_title'];// "Datenlizenz Deutschland – Namensnennung – nicht kommerziell"; //termsofuse.description OK
@@ -229,7 +229,7 @@
 	//new for solving schema problems with govdata 2015-10-02
 	//********************************************
 	//$package->extras->terms_of_use->license_url = $mbArray['tou_licence_url']; //TODO - test why ogdp rlp don't like extras
-	$package->maintainer_email = $mbArray['group_email'];//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
+	$package->maintainer_email = str_replace("(at)", "@", $mbArray['group_email']);//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
 	$package->url = $wrapperUrl."?LAYER[zoom]=1&LAYER[id]=".$mbArray['resource_id'];// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
 	//$package->extras->dates[0]->date = date("Y-m-d",strtotime($mbArray['service_timestamp']))."T00:00:00";//example from Hamburg: "dates": "[{\"date\": \"2014-09-01T00:00:00\", \"role\": \"veroeffentlicht\"}]"
 	//$package->extras->dates[0]->role = "veroeffentlicht";//TODO - test why ogdp rlp don't like extras