Merge pull request #964 from annando/twitter-contact

[friendica-addons.git] / openstreetmap / openstreetmap.php

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 4391d1b00179ad07038fb9d9f552f2f5bca003d4..5df1c7d7d42db85428c9701d1c46e796dc08f2d0 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -11,7 +11,6 @@
 
 use Friendica\DI;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -206,8 +205,8 @@ function openstreetmap_addon_admin(&$a, &$o)
 
        $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>')],
+                       '$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" rel="noopener noreferrer">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" rel="noopener noreferrer">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.')],
        ]);
@@ -220,10 +219,10 @@ function openstreetmap_addon_admin_post(&$a)
        $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(DI::l10n()->t('Settings updated.') . EOL);
 }