Unescape invite_desc template variable

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index e75e9cebaeda19828c79a9df552eaa656d8e5336..81275df6fb7a0053be199acd0c699a30febfdffc 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -2,26 +2,33 @@
 /**
  * @file mod/friendica.php
  */
+
 use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 
 function friendica_init(App $a)
 {
        if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
-               $register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+               $register_policies = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+
+               $register_policy = $register_policies[intval(Config::get('config', 'register_policy'))];
+
+               if ($register_policy == 'REGISTER_OPEN' && Config::get('config', 'invitation_only')) {
+                       $register_policy = 'REGISTER_INVITATION';
+               }
 
                $sql_extra = '';
-               if (x($a->config, 'admin_nickname')) {
-                       $sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname']));
+               if (!empty($a->config['admin_nickname'])) {
+                       $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
                }
-               if (isset($a->config['admin_email']) && $a->config['admin_email']!='') {
-                       $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+               if (!empty(Config::get('config', 'admin_email'))) {
+                       $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 
-                       $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
+                       $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", DBA::escape($adminlist[0]));
                        $admin = [
                                'name' => $r[0]['username'],
                                'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'],
@@ -30,19 +37,11 @@ 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 (DBM::is_result($r)) {
-                               foreach ($r as $rr) {
-                                       $visible_addons[] = $rr['name'];
-                               }
-                       }
-               }
+               $visible_addons = Addon::getVisibleList();
 
                Config::load('feature_lock');
                $locked_features = [];
-               if (is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+               if (!empty($a->config['feature_lock'])) {
                        foreach ($a->config['feature_lock'] as $k => $v) {
                                if ($k === 'config_loaded') {
                                        continue;
@@ -53,18 +52,21 @@ function friendica_init(App $a)
                }
 
                $data = [
-                       'version'         => FRIENDICA_VERSION,
-                       'url'             => System::baseUrl(),
-                       'addons'         => $visible_addons,
-                       'locked_features' => $locked_features,
-                       'register_policy' =>  $register_policy[$a->config['register_policy']],
-                       'admin'           => $admin,
-                       'site_name'       => $a->config['sitename'],
-                       'platform'        => FRIENDICA_PLATFORM,
-                       'info'            => ((x($a->config, 'info')) ? $a->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,
+                       '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();
        }
@@ -74,8 +76,9 @@ function friendica_content(App $a)
 {
        $o = '<h1>Friendica</h1>' . PHP_EOL;
        $o .= '<p>';
-       $o .= L10n::t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
-       $o .= L10n::t('running at web location') . ' ' . System::baseUrl();
+       $o .= L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+               '<strong>' . FRIENDICA_VERSION . '</strong>', System::baseUrl(), '<strong>' . DB_UPDATE_VERSION . '</strong>',
+               '<strong>' . Config::get("system", "post_update_version") . '</strong>');
        $o .= '</p>' . PHP_EOL;
 
        $o .= '<p>';
@@ -89,16 +92,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 (DBM::is_result($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;