Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 18d045f2d57d44244c605cf978dc14394388d241..f613dfd39cef05e171db82c410fc75be35714507 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -1,7 +1,8 @@
 <?php
 
-if(! function_exists('friendica_init')) {
-function friendica_init(&$a) {
+use \Friendica\Core\Config;
+
+function friendica_init(App $a) {
        if ($a->argv[1]=="json"){
                $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
@@ -16,7 +17,7 @@ function friendica_init(&$a) {
                        $r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($adminlist[0]));
                        $admin = array(
                                'name' => $r[0]['username'],
-                               'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
+                               'profile'=> App::get_baseurl().'/profile/'.$r[0]['nickname'],
                        );
                } else {
                        $admin = false;
@@ -25,12 +26,12 @@ function friendica_init(&$a) {
                $visible_plugins = array();
                if(is_array($a->plugins) && count($a->plugins)) {
                        $r = q("select * from addon where hidden = 0");
-                       if(count($r))
+                       if (dbm::is_result($r))
                                foreach($r as $rr)
                                        $visible_plugins[] = $rr['name'];
                }
 
-               load_config('feature_lock');
+               Config::load('feature_lock');
                $locked_features = array();
                if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
                        foreach($a->config['feature_lock'] as $k => $v) {
@@ -50,17 +51,17 @@ function friendica_init(&$a) {
                        'site_name' => $a->config['sitename'],
                        'platform' => FRIENDICA_PLATFORM,
                        'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
-                       'no_scrape_url' => $a->get_baseurl().'/noscrape'
+                       'no_scrape_url' => App::get_baseurl().'/noscrape'
                );
 
                echo json_encode($data);
                killme();
        }
 }
-}
 
-if(! function_exists('friendica_content')) {
-function friendica_content(&$a) {
+
+
+function friendica_content(App $a) {
 
        $o = '';
        $o .= '<h3>Friendica</h3>';
@@ -81,7 +82,7 @@ function friendica_content(&$a) {
        $visible_plugins = array();
        if(is_array($a->plugins) && count($a->plugins)) {
                $r = q("select * from addon where hidden = 0");
-               if(count($r))
+               if (dbm::is_result($r))
                        foreach($r as $rr)
                                $visible_plugins[] = $rr['name'];
        }
@@ -106,5 +107,5 @@ function friendica_content(&$a) {
        call_hooks('about_hook', $o);
 
        return $o;
-}
+
 }