Merge branch '3.6-release'

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

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index a3944d6dbaef43268d5b264dcdde644647a0593b..afdb087b37cf163da27dd5d1d84ce5bb012ed5c1 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -82,24 +82,29 @@ function fromapp_settings(&$a, &$s)
        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
-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 = get_pconfig(local_user(), 'fromapp', 'app');
-       $force = intval(get_pconfig(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;
-
 }