X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=openstreetmap%2Fopenstreetmap.php;h=61fe1efd4856c9d1d257d1ecf10b2b19a5d48121;hb=09bb49eef5acf3b12ab6fae4687f7eec06c40eee;hp=bfe960fad5e347fcec2b0c3595a977919f78019e;hpb=39dd3dffe07efd69fa1ac6d0bd243c7fc0e3a66f;p=friendica-addons.git

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index bfe960fa..61fe1efd 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -8,43 +8,54 @@
  * Author: Klaus Weidenbach
  *
  */
-use Friendica\Core\Addon;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
+
+use Friendica\DI;
+use Friendica\Core\Cache\Duration;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
-const OSM_TMS = 'http://www.openstreetmap.org';
-const OSM_NOM = 'http://nominatim.openstreetmap.org/search.php';
+const OSM_TMS = 'https://www.openstreetmap.org';
+const OSM_NOM = 'https://nominatim.openstreetmap.org/search.php';
 const OSM_ZOOM = 16;
 const OSM_MARKER = 0;
 
 function openstreetmap_install()
 {
-	Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-	Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-	Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-	Addon::registerHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
-	Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
-
-	logger("installed openstreetmap");
+	Hook::register('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
+	Hook::register('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+	Hook::register('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+	Hook::register('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
+	Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+
+	Logger::log("installed openstreetmap");
 }
 
 function openstreetmap_uninstall()
 {
-	Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-	Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-	Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-	Addon::unregisterHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
-	Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+	Hook::unregister('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
+	Hook::unregister('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+	Hook::unregister('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+	Hook::unregister('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Hook::unregister('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
+	Hook::unregister('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+
+	Logger::log("removed openstreetmap");
+}
 
-	logger("removed openstreetmap");
+function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
+{
+	$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
 }
 
-function openstreetmap_alterheader($a, &$navHtml) {
-	$addScriptTag = '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
-	$a->page['htmlhead'] .= $addScriptTag;
+function openstreetmap_alterheader($a, &$navHtml)
+{
+	$addScriptTag = '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
+	DI::page()['htmlhead'] .= $addScriptTag;
 }
 
 /**
@@ -52,7 +63,7 @@ function openstreetmap_alterheader($a, &$navHtml) {
  *
  * If an item has coordinates add link to a tile map server, e.g. openstreetmap.org.
  * If an item has a location open it with the help of OSM's Nominatim reverse geocode search.
- * 
+ *
  * @param mixed $a
  * @param array& $item
  */
@@ -60,6 +71,7 @@ function openstreetmap_location($a, &$item)
 {
 	if (!(strlen($item['location']) || strlen($item['coord']))) {
 		return;
+	}
 
 	/*
 	 * Get the configuration variables from the config.
@@ -69,10 +81,10 @@ function openstreetmap_location($a, &$item)
 	 * ?mlat=lat&mlon=lon for markers.
 	 */
 
-	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
-	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
-	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
+	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
+	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
@@ -92,20 +104,22 @@ function openstreetmap_location($a, &$item)
 		}
 	}
 
-	if ($target == "")
+	if (empty($target)) {
 		$target = $nomserver.'?q='.urlencode($item['location']);
+	}
 
-	if ($item['location'] != "")
+	if ($item['location'] != "") {
 		$title = $item['location'];
-	else
+	} else {
 		$title = $item['coord'];
+	}
 
 	$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
 }
 
 function openstreetmap_get_coordinates($a, &$b)
 {
-	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
@@ -115,13 +129,13 @@ function openstreetmap_get_coordinates($a, &$b)
 	$args = '?q=' . urlencode($b['location']) . '&format=json';
 
 	$cachekey = "openstreetmap:" . $b['location'];
-	$j = Cache::get($cachekey);
+	$j = DI::cache()->get($cachekey);
 
 	if (is_null($j)) {
-		$x = Network::curl($nomserver . $args);
-		if ($x['success']) {
-			$j = json_decode($x['body'], true);
-			Cache::set($cachekey, $j, CACHE_MONTH);
+		$curlResult = Network::curl($nomserver . $args);
+		if ($curlResult->isSuccess()) {
+			$j = json_decode($curlResult->getBody(), true);
+			DI::cache()->set($cachekey, $j, Duration::MONTH);
 		}
 	}
 
@@ -142,20 +156,20 @@ function openstreetmap_generate_named_map(&$a, &$b)
 
 function openstreetmap_generate_map(&$a, &$b)
 {
-	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
 
-	if (strpos(z_root(), 'https:') !== false) {
+	if (strpos(DI::baseUrl()->get(true), 'https:') !== false) {
 		$tmsserver = str_replace('http:','https:',$tmsserver);
 	}
 
-	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
 
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	logger('lat: ' . $lat, LOGGER_DATA);
-	logger('lon: ' . $lon, LOGGER_DATA);
+	Logger::log('lat: ' . $lat, Logger::DATA);
+	Logger::log('lon: ' . $lon, Logger::DATA);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -163,7 +177,7 @@ function openstreetmap_generate_map(&$a, &$b)
 		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
 	}
 
-	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? Strings::escapeHtml($b['location']) : DI::l10n()->t('View Larger')) . '</a>';
 	if (empty($b['mode'])) {
 		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
 				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
@@ -173,44 +187,42 @@ function openstreetmap_generate_map(&$a, &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	logger('generate_map: ' . $b['html'], LOGGER_DATA);
+	Logger::log('generate_map: ' . $b['html'], Logger::DATA);
 }
 
 function openstreetmap_addon_admin(&$a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/openstreetmap/");
-	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
-	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
-	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/openstreetmap/");
+	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
+	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
+	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
 		$nomserver = OSM_NOM;
 	}
 
-	$o = replace_macros($t, [
-			'$submit' => L10n::t('Submit'),
-			'$tmsserver' => ['tmsserver', L10n::t('Tile Server URL'), $tmsserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
-			'$nomserver' => ['nomserver', L10n::t('Nominatim (reverse geocoding) Server URL'), $nomserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
-			'$zoom' => ['zoom', L10n::t('Default zoom'), $zoom, L10n::t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
-			'$marker' => ['marker', L10n::t('Include marker on map'), $marker, L10n::t('Include a marker on the map.')],
+	$o = Renderer::replaceMacros($t, [
+			'$submit' => DI::l10n()->t('Submit'),
+			'$tmsserver' => ['tmsserver', DI::l10n()->t('Tile Server URL'), $tmsserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
+			'$nomserver' => ['nomserver', DI::l10n()->t('Nominatim (reverse geocoding) Server URL'), $nomserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
+			'$zoom' => ['zoom', DI::l10n()->t('Default zoom'), $zoom, DI::l10n()->t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
+			'$marker' => ['marker', DI::l10n()->t('Include marker on map'), $marker, DI::l10n()->t('Include a marker on the map.')],
 	]);
 }
 
 function openstreetmap_addon_admin_post(&$a)
 {
-	$urltms = defaults($_POST, 'tmsserver', OSM_TMS);
-	$urlnom = defaults($_POST, 'nomserver', OSM_NOM);
-	$zoom = defaults($_POST, 'zoom', OSM_ZOOM);
-	$marker = defaults($_POST, 'marker', OSM_MARKER);
+	$urltms = ($_POST['tmsserver'] ?? '') ?: OSM_TMS;
+	$urlnom = ($_POST['nomserver'] ?? '') ?: OSM_NOM;
+	$zoom = ($_POST['zoom'] ?? '') ?: OSM_ZOOM;
+	$marker = ($_POST['marker'] ?? '') ?: OSM_MARKER;
 
-	Config::set('openstreetmap', 'tmsserver', $urltms);
-	Config::set('openstreetmap', 'nomserver', $urlnom);
-	Config::set('openstreetmap', 'zoom', $zoom);
-	Config::set('openstreetmap', 'marker', $marker);
+	DI::config()->set('openstreetmap', 'tmsserver', $urltms);
+	DI::config()->set('openstreetmap', 'nomserver', $urlnom);
+	DI::config()->set('openstreetmap', 'zoom', $zoom);
+	DI::config()->set('openstreetmap', 'marker', $marker);
 
-	info(L10n::t('Settings updated.') . EOL);
+	info(DI::l10n()->t('Settings updated.') . EOL);
 }
-
-