Merge pull request #443 from rebeka-catalina/rct/d/NSFW_README_examples

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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 8226fc0bf6701170ac6518bd94cf185d2a4bfeb3..71e05c8b617553b8905b124c05483eaf254d3a75 100755 (executable)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -20,6 +20,8 @@
  *
  */
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function geonames_install() {
 
@@ -40,8 +42,8 @@ function geonames_install() {
         *
         */
 
-       register_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_settings');
-       register_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_settings_post');
+       register_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
+       register_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post');
 
        logger("installed geonames");
 }
@@ -58,8 +60,8 @@ function geonames_uninstall() {
         */
 
        unregister_hook('post_local',    'addon/geonames/geonames.php', 'geonames_post_hook');
-       unregister_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_settings');
-       unregister_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_settings_post');
+       unregister_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
+       unregister_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post');
 
 
        logger("removed geonames");
@@ -91,8 +93,8 @@ function geonames_post_hook($a, &$item) {
 
        /* Retrieve our personal config setting */
 
-       $geo_account = get_config('geonames', 'username');
-       $active = get_pconfig(local_user(), 'geonames', 'enable');
+       $geo_account = Config::get('geonames', 'username');
+       $active = PConfig::get(local_user(), 'geonames', 'enable');
 
        if((! $geo_account) || (! $active))
                return;
@@ -135,10 +137,10 @@ function geonames_post_hook($a, &$item) {
  *
  */
 
-function geonames_settings_post($a,$post) {
+function geonames_plugin_admin_post($a,$post) {
        if(! local_user() || (! x($_POST,'geonames-submit')))
                return;
-       set_pconfig(local_user(),'geonames','enable',intval($_POST['geonames']));
+       PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames']));
 
        info( t('Geonames settings updated.') . EOL);
 }
@@ -153,12 +155,12 @@ function geonames_settings_post($a,$post) {
 
 
 
-function geonames_settings(&$a,&$s) {
+function geonames_plugin_admin(&$a,&$s) {
 
        if(! local_user())
                return;
 
-       $geo_account = get_config('geonames', 'username');
+       $geo_account = Config::get('geonames', 'username');
 
        if(! $geo_account)
                return;
@@ -169,7 +171,7 @@ function geonames_settings(&$a,&$s) {
 
        /* Get the current state of our config variable */
 
-       $enabled = get_pconfig(local_user(),'geonames','enable');
+       $enabled = PConfig::get(local_user(),'geonames','enable');
 
        $checked = (($enabled) ? ' checked="checked" ' : '');
 
@@ -184,6 +186,6 @@ function geonames_settings(&$a,&$s) {
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }