indentation

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

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 8335f38e2c43135d447feebdb145f083ca35ac5e..1a4a55714f8fe4b76f08b37d4d530f9ffdd480c7 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -8,27 +8,28 @@
  * Author: Klaus Weidenbach
  *
  */
- 
+use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-
+use Friendica\Core\L10n;
+use Friendica\Util\Network;
 
 function openstreetmap_install()
 {
-       register_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-       register_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-       register_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-       register_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+       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('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
        logger("installed openstreetmap");
 }
 
 function openstreetmap_uninstall()
 {
-       unregister_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-       unregister_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-       unregister_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-       unregister_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+       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('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
        logger("removed openstreetmap");
 }
@@ -44,7 +45,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
  */
@@ -115,12 +116,12 @@ function openstreetmap_generate_named_map(&$a, &$b)
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
        $args = '?q=' . urlencode($b['location']) . '&format=json';
 
-       $x = z_fetch_url($nomserver . $args);
+       $x = Network::curl($nomserver . $args);
        if($x['success']) {
                $j = json_decode($x['body'],true);
 
                if($j && is_array($j) && $j[0]['lat'] && $j[0]['lon']) {
-                       $arr = array('lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => '');
+                       $arr = ['lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => ''];
                        openstreetmap_generate_map($a,$arr);
                        $b['html'] = $arr['html'];
                }
@@ -139,12 +140,12 @@ function openstreetmap_generate_map(&$a, &$b)
 
 
        $zoom = Config::get('openstreetmap', 'zoom');
-       if(! $zoom) {
+       if (!$zoom) {
                $zoom = 16;
        }
 
        $marker = Config::get('openstreetmap', 'marker');
-       if(! $marker) {
+       if (!$marker) {
                $marker = 0;
        }
 
@@ -157,42 +158,41 @@ function openstreetmap_generate_map(&$a, &$b)
 
        $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) ;
 
-       $b['html'] .=  '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : t('View Larger')) . '</a></small>';
+       $b['html'] .=  '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a></small>';
 
        logger('generate_map: ' . $b['html'], LOGGER_DATA);
-
 }
 
-function openstreetmap_plugin_admin(&$a, &$o)
+function openstreetmap_addon_admin(&$a, &$o)
 {
        $t = get_markup_template("admin.tpl", "addon/openstreetmap/");
        $tmsserver = Config::get('openstreetmap', 'tmsserver');
-       if(! $tmsserver) {
+       if (!$tmsserver) {
                $tmsserver = 'http://www.openstreetmap.org';
        }
        $nomserver = Config::get('openstreetmap', 'nomserver');
-       if(! $nomserver) {
+       if (!$nomserver) {
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
        }
        $zoom = Config::get('openstreetmap', 'zoom');
-       if(! $zoom) {
+       if (!$zoom) {
                $zoom = 16;
        }
        $marker = Config::get('openstreetmap', 'marker');
-       if(! $marker) {
+       if (!$marker) {
                $marker = 0;
        }
 
-       $o = replace_macros($t, array(
-                       '$submit' => t('Submit'),
-                       '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
-                       '$nomserver' => array('nomserver', t('Nominatim (reverse geocoding) Server URL'), $nomserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')),
-                       '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest, also depends on tile server)')),
-                       '$marker' => array('marker', t('Include marker on map'), $marker, t('Include a marker on the map.')),
-       ));
+       $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.')],
+       ]);
 }
 
-function openstreetmap_plugin_admin_post(&$a)
+function openstreetmap_addon_admin_post(&$a)
 {
        $urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : '');
        $urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : '');
@@ -202,5 +202,5 @@ function openstreetmap_plugin_admin_post(&$a)
        Config::set('openstreetmap', 'nomserver', $urlnom);
        Config::set('openstreetmap', 'zoom', $zoom);
        Config::set('openstreetmap', 'marker', $marker);
-       info( t('Settings updated.') . EOL);
+       info(L10n::t('Settings updated.') . EOL);
 }