Preparation to make the automatic authentication work (hopefully) reliable

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

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 135451698d9cae89d70f17775f9c85fe42c869b2..8335f38e2c43135d447feebdb145f083ca35ac5e 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,10 +9,12 @@
  *
  */
  
-require_once('include/cache.php');
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
 
 
-function openstreetmap_install() {
+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');
@@ -21,7 +23,8 @@ function openstreetmap_install() {
        logger("installed openstreetmap");
 }
 
-function openstreetmap_uninstall() {
+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');
@@ -30,7 +33,8 @@ function openstreetmap_uninstall() {
        logger("removed openstreetmap");
 }
 
-function openstreetmap_alterheader($a, &$navHtml) {
+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;
 }
@@ -46,8 +50,9 @@ function openstreetmap_alterheader($a, &$navHtml) {
  */
 function openstreetmap_location($a, &$item) {
 
-       if(! (strlen($item['location']) || strlen($item['coord'])))
+       if(! (strlen($item['location']) || strlen($item['coord']))) {
                return;
+       }
 
        /*
         * Get the configuration variables from the config.
@@ -57,21 +62,25 @@ function openstreetmap_location($a, &$item) {
         * ?mlat=lat&mlon=lon for markers.
         */
 
-       $tmsserver = get_config('openstreetmap', 'tmsserver');
-       if(! $tmsserver)
+       $tmsserver = Config::get('openstreetmap', 'tmsserver');
+       if(! $tmsserver) {
                $tmsserver = 'http://www.openstreetmap.org';
+       }
 
-       $nomserver = get_config('openstreetmap', 'nomserver');
-       if(! $nomserver)
+       $nomserver = Config::get('openstreetmap', 'nomserver');
+       if(! $nomserver) {
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
+       }
 
-       $zoom = get_config('openstreetmap', 'zoom');
-       if(! $zoom)
+       $zoom = Config::get('openstreetmap', 'zoom');
+       if(! $zoom) {
                $zoom = 16;
+       }
 
-       $marker = get_config('openstreetmap', 'marker');
-       if(! $marker)
+       $marker = Config::get('openstreetmap', 'marker');
+       if(! $marker) {
                $marker = 0;
+       }
 
        if ($item['coord'] != "") {
                $coords = explode(' ', $item['coord']);
@@ -85,22 +94,23 @@ function openstreetmap_location($a, &$item) {
                }
        }
 
-       if ($target == "")
+       if ($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_generate_named_map(&$a,&$b) {
-
-
-       $nomserver = get_config('openstreetmap', 'nomserver');
+function openstreetmap_generate_named_map(&$a, &$b)
+{
+       $nomserver = Config::get('openstreetmap', 'nomserver');
        if(! $nomserver)
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
        $args = '?q=' . urlencode($b['location']) . '&format=json';
@@ -117,22 +127,26 @@ function openstreetmap_generate_named_map(&$a,&$b) {
        }
 }
 
-function openstreetmap_generate_map(&$a,&$b) {
-
-       $tmsserver = get_config('openstreetmap', 'tmsserver');
-       if(! $tmsserver)
+function openstreetmap_generate_map(&$a, &$b)
+{
+       $tmsserver = Config::get('openstreetmap', 'tmsserver');
+       if(! $tmsserver) {
                $tmsserver = 'http://www.openstreetmap.org';
-       if(strpos(z_root(),'https:') !== false)
+       }
+       if(strpos(z_root(),'https:') !== false) {
                $tmsserver = str_replace('http:','https:',$tmsserver);
+       }
 
 
-       $zoom = get_config('openstreetmap', 'zoom');
-       if(! $zoom)
+       $zoom = Config::get('openstreetmap', 'zoom');
+       if(! $zoom) {
                $zoom = 16;
+       }
 
-       $marker = get_config('openstreetmap', 'marker');
-       if(! $marker)
+       $marker = Config::get('openstreetmap', 'marker');
+       if(! $marker) {
                $marker = 0;
+       }
 
        $lat = $b['lat']; // round($b['lat'], 5);
        $lon = $b['lon']; // round($b['lon'], 5);
@@ -149,20 +163,25 @@ function openstreetmap_generate_map(&$a,&$b) {
 
 }
 
-function openstreetmap_plugin_admin(&$a, &$o) {
+function openstreetmap_plugin_admin(&$a, &$o)
+{
        $t = get_markup_template("admin.tpl", "addon/openstreetmap/");
-       $tmsserver = get_config('openstreetmap', 'tmsserver');
-       if(! $tmsserver)
+       $tmsserver = Config::get('openstreetmap', 'tmsserver');
+       if(! $tmsserver) {
                $tmsserver = 'http://www.openstreetmap.org';
-       $nomserver = get_config('openstreetmap', 'nomserver');
-       if(! $nomserver)
+       }
+       $nomserver = Config::get('openstreetmap', 'nomserver');
+       if(! $nomserver) {
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
-       $zoom = get_config('openstreetmap', 'zoom');
-       if(! $zoom)
+       }
+       $zoom = Config::get('openstreetmap', 'zoom');
+       if(! $zoom) {
                $zoom = 16;
-       $marker = get_config('openstreetmap', 'marker');
-       if(! $marker)
+       }
+       $marker = Config::get('openstreetmap', 'marker');
+       if(! $marker) {
                $marker = 0;
+       }
 
        $o = replace_macros($t, array(
                        '$submit' => t('Submit'),
@@ -172,16 +191,16 @@ function openstreetmap_plugin_admin(&$a, &$o) {
                        '$marker' => array('marker', t('Include marker on map'), $marker, t('Include a marker on the map.')),
        ));
 }
-function openstreetmap_plugin_admin_post(&$a) {
+
+function openstreetmap_plugin_admin_post(&$a)
+{
        $urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : '');
        $urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : '');
        $zoom = ((x($_POST, 'zoom')) ? intval(trim($_POST['zoom'])) : '16');
        $marker = ((x($_POST, 'marker')) ? intval(trim($_POST['marker'])) : '0');
-       set_config('openstreetmap', 'tmsserver', $urltms);
-       set_config('openstreetmap', 'nomserver', $urlnom);
-       set_config('openstreetmap', 'zoom', $zoom);
-       set_config('openstreetmap', 'marker', $marker);
+       Config::set('openstreetmap', 'tmsserver', $urltms);
+       Config::set('openstreetmap', 'nomserver', $urlnom);
+       Config::set('openstreetmap', 'zoom', $zoom);
+       Config::set('openstreetmap', 'marker', $marker);
        info( t('Settings updated.') . EOL);
 }
-
-