X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=geonames%2Fgeonames.php;h=55ae1920ba62c3309c1ca25e5ae36d186b62c835;hp=19725bef3ff53e1561f236cead784715fe8e9757;hb=0afd633346b517894ff8e92c705bd5d052dd06a2;hpb=cdb914458b8dadd94d7feb31a21e4b5ddd8ff872

diff --git a/geonames/geonames.php b/geonames/geonames.php
old mode 100755
new mode 100644
index 19725bef..55ae1920
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -19,7 +19,9 @@
  * system will call the name_uninstall() function.
  *
  */
-
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function geonames_install() {
 
@@ -30,7 +32,7 @@ function geonames_install() {
 	 *
 	 */
 
-	register_hook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook');
+	Addon::registerHook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook');
 
 	/**
 	 *
@@ -40,8 +42,8 @@ function geonames_install() {
 	 *
 	 */
 
-	register_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
-	register_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post');
+	Addon::registerHook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
+	Addon::registerHook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post');
 
 	logger("installed geonames");
 }
@@ -57,9 +59,9 @@ function geonames_uninstall() {
 	 *
 	 */
 
-	unregister_hook('post_local',    'addon/geonames/geonames.php', 'geonames_post_hook');
-	unregister_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
-	unregister_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post');
+	Addon::unregisterHook('post_local',    'addon/geonames/geonames.php', 'geonames_post_hook');
+	Addon::unregisterHook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin');
+	Addon::unregisterHook('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;
@@ -138,7 +140,7 @@ function geonames_post_hook($a, &$item) {
 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);
 }
@@ -158,7 +160,7 @@ 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_plugin_admin(&$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_plugin_admin(&$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>';
 
 }