X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=d10deb2e88452ce94cbdf4704b35f98053a789ea;hb=5ea033db33c62562dcd27dd70447a35b3d14326e;hp=1929150f27beb626ae4baad195798e807b578eb4;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git diff --git a/mod/friendica.php b/mod/friendica.php index 1929150f27..d10deb2e88 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -2,26 +2,40 @@ /** * @file mod/friendica.php */ + use Friendica\App; use Friendica\Core\Addon; -use Friendica\Core\System; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Database\DBM; +use Friendica\Core\System; +use Friendica\Database\DBA; +use Friendica\Module\Register; function friendica_init(App $a) { - if ($a->argv[1] == "json") { - $register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN']; + if (!empty($a->argv[1]) && ($a->argv[1] == "json")) { + $register_policies = [ + Register::CLOSED => 'REGISTER_CLOSED', + Register::APPROVE => 'REGISTER_APPROVE', + Register::OPEN => 'REGISTER_OPEN' + ]; + + $register_policy_int = intval(Config::get('config', 'register_policy')); + if ($register_policy_int !== Register::CLOSED && Config::get('config', 'invitation_only')) { + $register_policy = 'REGISTER_INVITATION'; + } else { + $register_policy = $register_policies[$register_policy_int]; + } $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 +44,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,20 +59,23 @@ 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(); + exit(); } } @@ -74,8 +83,9 @@ function friendica_content(App $a) { $o = '
'; - $o .= L10n::t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' '; - $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.', + '' . FRIENDICA_VERSION . '', System::baseUrl(), '' . DB_UPDATE_VERSION . '', + '' . Config::get("system", "post_update_version") . ''); $o .= '
' . PHP_EOL; $o .= ''; @@ -89,16 +99,7 @@ function friendica_content(App $a) $o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'); $o .= '
' . 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 .= '' . L10n::t('Installed addons/apps:') . '
' . PHP_EOL; $sorted = $visible_addons; @@ -132,7 +133,7 @@ function friendica_content(App $a) $o .= '' . PHP_EOL; } - Addon::callHooks('about_hook', $o); + Hook::callAll('about_hook', $o); return $o; }