Merge branch '3.6-rc'

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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index eb5a0c87234fc194a3410d5fcd0c61be76fda9bc..905dfdc599f7de36b4b0a9ef21d102bb750459e5 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -23,6 +23,8 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function geonames_install() {
 
@@ -94,8 +96,8 @@ function geonames_post_hook($a, &$item) {
 
        /* Retrieve our personal config setting */
 
-       $geo_account = Config::get('geonames', 'username');
-       $active = PConfig::get(local_user(), 'geonames', 'enable');
+       $geo_account = get_config('geonames', 'username');
+       $active = get_pconfig(local_user(), 'geonames', 'enable');
 
        if((! $geo_account) || (! $active))
                return;
@@ -111,12 +113,12 @@ function geonames_post_hook($a, &$item) {
         *
         */
 
-       $s = fetch_url('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+       $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
        if(! $s)
                return;
 
-       $xml = parse_xml_string($s);
+       $xml = XML::parseString($s);
 
        if($xml->geoname->name && $xml->geoname->countryName)
                $item['location'] = $xml->geoname->name . ', ' . $xml->geoname->countryName;
@@ -141,7 +143,7 @@ function geonames_post_hook($a, &$item) {
 function geonames_addon_admin_post($a,$post) {
        if(! local_user() || (! x($_POST,'geonames-submit')))
                return;
-       PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames']));
+       set_pconfig(local_user(),'geonames','enable',intval($_POST['geonames']));
 
        info(L10n::t('Geonames settings updated.') . EOL);
 }
@@ -161,7 +163,7 @@ function geonames_addon_admin(&$a,&$s) {
        if(! local_user())
                return;
 
-       $geo_account = Config::get('geonames', 'username');
+       $geo_account = get_config('geonames', 'username');
 
        if(! $geo_account)
                return;
@@ -172,7 +174,7 @@ function geonames_addon_admin(&$a,&$s) {
 
        /* Get the current state of our config variable */
 
-       $enabled = PConfig::get(local_user(),'geonames','enable');
+       $enabled = get_pconfig(local_user(),'geonames','enable');
 
        $checked = (($enabled) ? ' checked="checked" ' : '');