X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=geocoordinates%2Fgeocoordinates.php;h=5cb90efde076c9b3a1120bc223eedaf3b613a0d7;hb=668ea972ccb3974ceba4be993a8a39a9734c3cad;hp=1a0b9daab7c1556e958ebafcf1e283f5a6109b0b;hpb=cbb915d9ad5924785fc29fa946fb3e14aabddcf3;p=friendica-addons.git

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 1a0b9daa..5cb90efd 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,104 +5,96 @@
  * 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\App;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\Network;
+use Friendica\DI;
 
 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');
-}
-
-
-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::register('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+	Hook::register('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
 }
 
-function geocoordinates_resolve_item(&$item)
+function geocoordinates_resolve_item(array &$item)
 {
-	if((!$item["coord"]) || ($item["location"]))
+	if ((!$item['coord']) || ($item['location'])) {
 		return;
+	}
 
-	$key = Config::get("geocoordinates", "api_key");
-	if ($key == "")
+	$key = DI::config()->get('geocoordinates', 'api_key');
+	if ($key == '') {
 		return;
+	}
 
-	$language = Config::get("geocoordinates", "language");
-	if ($language == "")
-		$language = "de";
+	$language = DI::config()->get('geocoordinates', 'language');
+	if ($language == '') {
+		$language = 'de';
+	}
 
-	$coords = explode(' ',$item["coord"]);
+	$coords = explode(' ', $item['coord']);
 
-	if (count($coords) < 2)
+	if (count($coords) < 2) {
 		return;
+	}
 
 	$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;
+		$item['location'] = $result;
 		return;
 	}
 
-	$s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
 
 	if (!$s) {
-		Logger::log("API could not be queried", Logger::DEBUG);
+		Logger::info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
-	if ($data->status->code != "200") {
-		Logger::log("API returned error ".$data->status->code." ".$data->status->message, Logger::DEBUG);
+	if ($data->status->code != '200') {
+		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		Logger::log("No results found for coordinates ".$item["coord"], Logger::DEBUG);
+		Logger::info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
-	$item["location"] = $data->results[0]->formatted;
+	$item['location'] = $data->results[0]->formatted;
 
-	Logger::log("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], Logger::DEBUG);
+	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
 
-	if ($item["location"] != "")
-		Cache::set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
+	if ($item['location'] != '') {
+		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);
+	}
 }
 
-function geocoordinates_post_hook($a, &$item)
+function geocoordinates_post_hook(&$item)
 {
 	geocoordinates_resolve_item($item);
 }
 
-function geocoordinates_addon_admin(&$a, &$o)
+function geocoordinates_addon_admin(string &$o)
 {
-
-	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/geocoordinates/");
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/geocoordinates/');
 
 	$o = Renderer::replaceMacros($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'), ''],
+		'$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)
+function geocoordinates_addon_admin_post()
 {
-	$api_key  = ((x($_POST, 'api_key')) ? notags(trim($_POST['api_key']))   : '');
-	Config::set('geocoordinates', 'api_key', $api_key);
-
-	$language  = ((x($_POST, 'language')) ? notags(trim($_POST['language']))   : '');
-	Config::set('geocoordinates', 'language', $language);
-	info(L10n::t('Settings updated.'). EOL);
+	DI::config()->set('geocoordinates', 'api_key', trim($_POST['api_key'] ?? ''));
+	DI::config()->set('geocoordinates', 'language', trim($_POST['language'] ?? ''));
 }