X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=81275df6fb7a0053be199acd0c699a30febfdffc;hb=58067cdfbf72c137e072afd52aaa94d9ee306d05;hp=f1b0fb4761b83fe782df41f379b8cf2c3a8e0d61;hpb=66a103e36a42ab251fd9ca6c4b56b54380e4d535;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index f1b0fb4761..81275df6fb 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -8,21 +8,27 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+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(Config::get('config', 'admin_nickname')));
+		if (!empty($a->config['admin_nickname'])) {
+			$sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
 		}
 		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'],
@@ -31,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 (!empty($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;
@@ -54,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[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,
+			'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();
 	}
@@ -75,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>';
@@ -90,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;