Move Config::get() to DI::config()->get()

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

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index c96f40e00ab124ab10e0e84e796a9cb268c7a826..fbb89d1c4a88bc517ab4d09d6cf7afa779671161 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,22 +5,26 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function geocoordinates_install()
 {
-       Addon::registerHook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
-       Addon::registerHook('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+       Hook::register('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+       Hook::register('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
 }
 
 
 function geocoordinates_uninstall()
 {
-       Addon::unregisterHook('post_local',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
-       Addon::unregisterHook('post_remote',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+       Hook::unregister('post_local',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+       Hook::unregister('post_remote',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
 }
 
 function geocoordinates_resolve_item(&$item)
@@ -28,11 +32,11 @@ function geocoordinates_resolve_item(&$item)
        if((!$item["coord"]) || ($item["location"]))
                return;
 
-       $key = Config::get("geocoordinates", "api_key");
+       $key = DI::config()->get("geocoordinates", "api_key");
        if ($key == "")
                return;
 
-       $language = Config::get("geocoordinates", "language");
+       $language = DI::config()->get("geocoordinates", "language");
        if ($language == "")
                $language = "de";
 
@@ -44,37 +48,37 @@ function geocoordinates_resolve_item(&$item)
        $coords[0] = round($coords[0], 5);
        $coords[1] = round($coords[1], 5);
 
-       $result = Cache::get("geocoordinates:".$language.":".$coords[0]."-".$coords[1]);
+       $result = DI::cache()->get("geocoordinates:".$language.":".$coords[0]."-".$coords[1]);
        if (!is_null($result)) {
                $item["location"] = $result;
                return;
        }
 
-       $s = fetch_url("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+       $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
 
        if (!$s) {
-               logger("API could not be queried", LOGGER_DEBUG);
+               Logger::log("API could not be queried", Logger::DEBUG);
                return;
        }
 
        $data = json_decode($s);
 
        if ($data->status->code != "200") {
-               logger("API returned error ".$data->status->code." ".$data->status->message, LOGGER_DEBUG);
+               Logger::log("API returned error ".$data->status->code." ".$data->status->message, Logger::DEBUG);
                return;
        }
 
        if (($data->total_results == 0) || (count($data->results) == 0)) {
-               logger("No results found for coordinates ".$item["coord"], LOGGER_DEBUG);
+               Logger::log("No results found for coordinates ".$item["coord"], Logger::DEBUG);
                return;
        }
 
        $item["location"] = $data->results[0]->formatted;
 
-       logger("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], LOGGER_DEBUG);
+       Logger::log("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], Logger::DEBUG);
 
        if ($item["location"] != "")
-               Cache::set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
+               DI::cache()->set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
 }
 
 function geocoordinates_post_hook($a, &$item)
@@ -85,21 +89,21 @@ function geocoordinates_post_hook($a, &$item)
 function geocoordinates_addon_admin(&$a, &$o)
 {
 
-       $t = get_markup_template("admin.tpl", "addon/geocoordinates/");
+       $t = Renderer::getMarkupTemplate("admin.tpl", "addon/geocoordinates/");
 
-       $o = replace_macros($t, [
-               '$submit' => L10n::t('Save Settings'),
-               '$api_key' => ['api_key', L10n::t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
-               '$language' => ['language', L10n::t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
+       $o = Renderer::replaceMacros($t, [
+               '$submit' => DI::l10n()->t('Save Settings'),
+               '$api_key' => ['api_key', DI::l10n()->t('API Key'), DI::config()->get('geocoordinates', 'api_key'), ''],
+               '$language' => ['language', DI::l10n()->t('Language code (IETF format)'), DI::config()->get('geocoordinates', 'language'), ''],
        ]);
 }
 
 function geocoordinates_addon_admin_post(&$a)
 {
-       $api_key  = ((x($_POST, 'api_key')) ? notags(trim($_POST['api_key']))   : '');
+       $api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
        Config::set('geocoordinates', 'api_key', $api_key);
 
-       $language  = ((x($_POST, 'language')) ? notags(trim($_POST['language']))   : '');
+       $language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
        Config::set('geocoordinates', 'language', $language);
-       info(L10n::t('Settings updated.'). EOL);
+       info(DI::l10n()->t('Settings updated.') . EOL);
 }