X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=f1b0fb4761b83fe782df41f379b8cf2c3a8e0d61;hb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;hp=c6cfdbdcc250915180baca17aad9da95782b5915;hpb=ead9d8623683f8ecdbe9b75bb7fd031d89d54ebe;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index c6cfdbdcc2..f1b0fb4761 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -2,24 +2,25 @@
 /**
  * @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\Core\System;
 use Friendica\Database\DBM;
 
 function friendica_init(App $a)
 {
-	if ($a->argv[1] == "json") {
+	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
 		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
 
 		$sql_extra = '';
 		if (x($a->config, 'admin_nickname')) {
-			$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname']));
+			$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc(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]));
 			$admin = [
@@ -42,7 +43,7 @@ function friendica_init(App $a)
 
 		Config::load('feature_lock');
 		$locked_features = [];
-		if (is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+		if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) {
 			foreach ($a->config['feature_lock'] as $k => $v) {
 				if ($k === 'config_loaded') {
 					continue;
@@ -55,13 +56,13 @@ function friendica_init(App $a)
 		$data = [
 			'version'         => FRIENDICA_VERSION,
 			'url'             => System::baseUrl(),
-			'addons'         => $visible_addons,
+			'addons'          => $visible_addons,
 			'locked_features' => $locked_features,
-			'register_policy' =>  $register_policy[$a->config['register_policy']],
+			'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
 			'admin'           => $admin,
-			'site_name'       => $a->config['sitename'],
+			'site_name'       => Config::get('config', 'sitename'),
 			'platform'        => FRIENDICA_PLATFORM,
-			'info'            => ((x($a->config, 'info')) ? $a->config['info'] : ''),
+			'info'            => Config::get('config', 'info'),
 			'no_scrape_url'   => System::baseUrl().'/noscrape'
 		];
 
@@ -83,10 +84,10 @@ function friendica_content(App $a)
 	$o .= '</p>' . PHP_EOL;
 
 	$o .= '<p>';
-	$o .= L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a>';
+	$o .= L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.L10n::t('the bugtracker at github').'</a>';
 	$o .= '</p>' . PHP_EOL;
 	$o .= '<p>';
-	$o .= L10n::t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com');
+	$o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
 	$o .= '</p>' . PHP_EOL;
 
 	$visible_addons = [];
@@ -100,7 +101,7 @@ function friendica_content(App $a)
 	}
 
 	if (count($visible_addons)) {
-		$o .= '<p>' . L10n::t('Installed addons/addons/apps:') . '</p>' . PHP_EOL;
+		$o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
 		$sorted = $visible_addons;
 		$s = '';
 		sort($sorted);
@@ -112,13 +113,18 @@ function friendica_content(App $a)
 				$s .= $p;
 			}
 		}
-		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>' . PHP_EOL;
+		$o .= '<div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">' . $s . '</div>' . PHP_EOL;
 	} else {
-		$o .= '<p>' . L10n::t('No installed addons/addons/apps') . '</p>' . PHP_EOL;
+		$o .= '<p>' . L10n::t('No installed addons/apps') . '</p>' . PHP_EOL;
+	}
+
+	if (Config::get('system', 'tosdisplay'))
+	{
+		$o .= '<p>'.L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', System::baseurl()).'</p>';
 	}
 
-	$blocklist = Config::get('system', 'blocklist');
-	if (count($blocklist)) {
+	$blocklist = Config::get('system', 'blocklist', []);
+	if (!empty($blocklist)) {
 		$o .= '<div id="about_blocklist"><p>' . L10n::t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
 		$o .= '<table class="table"><thead><tr><th>' . L10n::t('Blocked domain') . '</th><th>' . L10n::t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
 		foreach ($blocklist as $b) {