Merge pull request #495 from MrPetovan/bug/remaining-call-hooks

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

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 2d0b98ca795b49c7875ecc5844b24ee8f19ab844..32234d1594610b1cb75faa54b0c21b086ab996db 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,14 +6,14 @@
  * Author: Commander Zot
  *
  */
-
+use Friendica\Core\Addon;
 use Friendica\Core\PConfig;
 
 function fromapp_install() {
 
-       register_hook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       register_hook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       register_hook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
+       Addon::registerHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
+       Addon::registerHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
+       Addon::registerHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
 
        logger("installed fromapp");
 }
@@ -21,9 +21,9 @@ function fromapp_install() {
 
 function fromapp_uninstall() {
 
-       unregister_hook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       unregister_hook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       unregister_hook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
+       Addon::unregisterHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
+       Addon::unregisterHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
+       Addon::unregisterHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
 
 
        logger("removed fromapp");
@@ -50,9 +50,7 @@ function fromapp_settings(&$a,&$s) {
 
        /* Get the current state of our config variable */
 
-       $fromapp = PConfig::get(local_user(),'fromapp','app');
-       if($fromapp === false)
-               $fromapp = '';
+       $fromapp = PConfig::get(local_user(),'fromapp', 'app', '');
 
        $force = intval(PConfig::get(local_user(),'fromapp','force'));
 
@@ -84,24 +82,29 @@ function fromapp_settings(&$a,&$s) {
 
 }
 
-function fromapp_post_hook(&$a,&$item) {
-   if(! local_user())
-        return;
+function fromapp_post_hook(&$a, &$item)
+{
+       if (! local_user()) {
+               return;
+       }
 
-    if(local_user() != $item['uid'])
-        return;
+       if (local_user() != $item['uid']) {
+               return;
+       }
 
-    $app = PConfig::get(local_user(), 'fromapp', 'app');
-       $force = intval(PConfig::get(local_user(), 'fromapp','force'));
+       $app = PConfig::get(local_user(), 'fromapp', 'app');
+       $force = intval(PConfig::get(local_user(), 'fromapp', 'force'));
 
-    if(($app === false) || (! strlen($app)))
-        return;
+       if (is_null($app) || (! strlen($app))) {
+               return;
+       }
 
-       if(strlen(trim($item['app'])) && (! $force))
+       if (strlen(trim($item['app'])) && (! $force)) {
                return;
+       }
 
-       $apps = explode(',',$app);
-       $item['app'] = trim($apps[mt_rand(0,count($apps)-1)]);
+       $apps = explode(',', $app);
+       $item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
+       
        return;
-
 }