* Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
-
use Friendica\Core\Cache;
use Friendica\Core\Config;
+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()
{
- register_hook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
- register_hook('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()
{
- unregister_hook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
- unregister_hook('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)
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";
$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)
geocoordinates_resolve_item($item);
}
-function geocoordinates_plugin_admin(&$a, &$o)
+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' => t('Save Settings'),
- '$api_key' => ['api_key', t('API Key'), Config::get('geocoordinates', 'api_key' ), ''],
- '$language' => ['language', 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_plugin_admin_post(&$a)
+function geocoordinates_addon_admin_post(&$a)
{
- $api_key = ((x($_POST,'api_key')) ? notags(trim($_POST['api_key'])) : '');
- Config::set('geocoordinates','api_key',$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'])) : '');
- Config::set('geocoordinates','language',$language);
- info(t('Settings updated.'). EOL);
+ $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : '');
+ Config::set('geocoordinates', 'language', $language);
+ info(DI::l10n()->t('Settings updated.') . EOL);
}