Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index f2cb5c50b6fe1b55f9ad07053da15d1d2dcc03c0..0e647eb5ea18ae31bc28035d54165f83af7b3eef 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -31,15 +31,7 @@ function friendica_init(App $a)
                        $admin = false;
                }
 
-               $visible_addons = [];
-               if (is_array($a->addons) && count($a->addons)) {
-                       $r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-                       if (DBA::isResult($r)) {
-                               foreach ($r as $rr) {
-                                       $visible_addons[] = $rr['name'];
-                               }
-                       }
-               }
+               $visible_addons = Addon::getVisibleList();
 
                Config::load('feature_lock');
                $locked_features = [];
@@ -54,18 +46,21 @@ function friendica_init(App $a)
                }
 
                $data = [
-                       'version'         => FRIENDICA_VERSION,
-                       'url'             => System::baseUrl(),
-                       'addons'          => $visible_addons,
-                       'locked_features' => $locked_features,
-                       'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
-                       'admin'           => $admin,
-                       'site_name'       => Config::get('config', 'sitename'),
-                       'platform'        => FRIENDICA_PLATFORM,
-                       'info'            => Config::get('config', 'info'),
-                       'no_scrape_url'   => System::baseUrl().'/noscrape'
+                       'version'          => FRIENDICA_VERSION,
+                       'url'              => System::baseUrl(),
+                       'addons'           => $visible_addons,
+                       'locked_features'  => $locked_features,
+                       'explicit_content' => (int)Config::get('system', 'explicit_content', false),
+                       'language'         => Config::get('system','language'),
+                       'register_policy'  => $register_policy[intval(Config::get('config', 'register_policy'))],
+                       'admin'            => $admin,
+                       'site_name'        => Config::get('config', 'sitename'),
+                       'platform'         => FRIENDICA_PLATFORM,
+                       'info'             => Config::get('config', 'info'),
+                       'no_scrape_url'    => System::baseUrl().'/noscrape'
                ];
 
+               header('Content-type: application/json; charset=utf-8');
                echo json_encode($data);
                killme();
        }
@@ -91,16 +86,7 @@ function friendica_content(App $a)
        $o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
        $o .= '</p>' . PHP_EOL;
 
-       $visible_addons = [];
-       if (is_array($a->addons) && count($a->addons)) {
-               $r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               $visible_addons[] = $rr['name'];
-                       }
-               }
-       }
-
+       $visible_addons = Addon::getVisibleList();
        if (count($visible_addons)) {
                $o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
                $sorted = $visible_addons;