X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=dc40840ab429f734b60dd11ddc6fb2c0e56f29e7;hb=39e12d77efbe3471d965591b5d6dbc166fd4cfcb;hp=faac6a815477a45712baa2c9835628948f3a0991;hpb=82e8e64d8832b588c4c7203896b46cd8e0ca3618;p=friendica-addons.git

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index faac6a81..dc40840a 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,22 +63,23 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\User;
 
 function jappixmini_install()
 {
-	register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-	register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+	Addon::registerHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Addon::registerHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
 
-	register_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-	register_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+	Addon::registerHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Addon::registerHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
 
-	register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+	Addon::registerHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
 
 	// Jappix source download as required by AGPL
-	register_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+	Addon::registerHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
 
 	// set standard configuration
 	$info_text = Config::get("jappixmini", "infotext");
@@ -103,18 +104,18 @@ function jappixmini_install()
 
 function jappixmini_uninstall()
 {
-	unregister_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-	unregister_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+	Addon::unregisterHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
 
-	unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-	unregister_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+	Addon::unregisterHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Addon::unregisterHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
 
-	unregister_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+	Addon::unregisterHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
 
-	unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+	Addon::unregisterHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
 }
 
-function jappixmini_plugin_admin(App $a, &$o)
+function jappixmini_addon_admin(App $a, &$o)
 {
 	// display instructions and warnings on addon settings page for admin
 	if (!file_exists("addon/jappixmini.tgz")) {
@@ -158,7 +159,7 @@ function jappixmini_plugin_admin(App $a, &$o)
 	$o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
 }
 
-function jappixmini_plugin_admin_post(App $a)
+function jappixmini_addon_admin_post(App $a)
 {
 	// set info text
 	$submit = $_REQUEST['jappixmini-admin-settings'];
@@ -229,7 +230,7 @@ function jappixmini_init()
 
 	}
 
-	// do not return an address if user deactivated plugin
+	// do not return an address if user deactivated addon
 	$activated = PConfig::get($uid, 'jappixmini', 'activate');
 	if (!$activated) {
 		killme();
@@ -246,10 +247,10 @@ function jappixmini_init()
 
 		$encrypted_address_hex = bin2hex($encrypted_address);
 
-		$answer = Array(
+		$answer = [
 			"status" => "ok",
 			"encrypted_address" => $encrypted_address_hex
-		);
+		];
 
 		$answer_json = json_encode($answer);
 		echo $answer_json;
@@ -514,7 +515,7 @@ function jappixmini_script(App $a)
 	}
 
 	// get a list of jabber accounts of the contacts
-	$contacts = Array();
+	$contacts = [];
 	$uid = local_user();
 	$rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
 	foreach ($rows as $row) {