Restructure Cache to follow new paradigm

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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index e701d8401c0472cf662a1675de802afcf10cbd16..8ea183db0d3cea238226894bd460343fa259aec0 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,13 +7,11 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function geonames_install()
@@ -48,7 +46,7 @@ function geonames_post_hook(App $a, array &$item)
         *      - The profile owner must have allowed our addon
         */
 
-       Logger::log('geonames invoked');
+       Logger::notice('geonames invoked');
 
        if (!local_user()) {   /* non-zero if this is a logged in user of this system */
                return;
@@ -64,7 +62,7 @@ function geonames_post_hook(App $a, array &$item)
 
        /* Retrieve our personal config setting */
 
-       $geo_account = Config::get('geonames', 'username');
+       $geo_account = DI::config()->get('geonames', 'username');
        $active = DI::pConfig()->get(local_user(), 'geonames', 'enable');
 
        if (!$geo_account || !$active) {
@@ -79,7 +77,7 @@ function geonames_post_hook(App $a, array &$item)
 
        /* OK, we're allowed to do our stuff. */
 
-       $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+       $s = DI::httpClient()->fetch('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
        if (!$s) {
                return;
@@ -109,8 +107,6 @@ function geonames_addon_settings_post(App $a, array $post)
        }
 
        DI::pConfig()->set(local_user(), 'geonames', 'enable', intval($_POST['geonames-enable']));
-
-       info(DI::l10n()->t('Geonames settings updated.'));
 }
 
 /**
@@ -127,7 +123,7 @@ function geonames_addon_settings(App $a, &$s)
                return;
        }
 
-       $geo_account = Config::get('geonames', 'username');
+       $geo_account = DI::config()->get('geonames', 'username');
 
        if (!$geo_account) {
                return;
@@ -140,7 +136,7 @@ function geonames_addon_settings(App $a, &$s)
        /* Get the current state of our config variable */
        $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable'));
 
-       $t = Renderer::getMarkupTemplate('settings.tpl', __DIR__);
+       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/');
        $s .= Renderer::replaceMacros($t, [
                '$title' => DI::l10n()->t('Geonames Settings'),
                '$description' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'),